diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-11 13:23:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 13:23:56 +0200 |
| commit | e38001f123a04f905a37bf038b2c983ebe350996 (patch) | |
| tree | 676a610092ba152a81d35868523d3c5609baaa5b /vendor/github.com/opencontainers/selinux/go-selinux/label | |
| parent | 88b8d2829ced423593f40030c04662ee596740b7 (diff) | |
| parent | e7085599f529f68534231b46fa95e885e68099f4 (diff) | |
| download | podman-e38001f123a04f905a37bf038b2c983ebe350996.tar.gz podman-e38001f123a04f905a37bf038b2c983ebe350996.tar.bz2 podman-e38001f123a04f905a37bf038b2c983ebe350996.zip | |
Merge pull request #6926 from containers/dependabot/go_modules/github.com/containers/storage-1.21.0
Bump github.com/containers/storage from 1.20.2 to 1.21.0
Diffstat (limited to 'vendor/github.com/opencontainers/selinux/go-selinux/label')
| -rw-r--r-- | vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go b/vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go index 779e2e3a8..10ac15a85 100644 --- a/vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go +++ b/vendor/github.com/opencontainers/selinux/go-selinux/label/label_selinux.go @@ -73,9 +73,9 @@ func InitLabels(options []string) (plabel string, mlabel string, Err error) { selinux.ReleaseLabel(processLabel) } processLabel = pcon.Get() - mountLabel = mcon.Get() selinux.ReserveLabel(processLabel) } + mountLabel = mcon.Get() } return processLabel, mountLabel, nil } diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go b/vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go index c2bdd35d7..a7d2d5e34 100644 --- a/vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go +++ b/vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go @@ -30,7 +30,6 @@ func Relabel(path string, fileLabel string, shared bool) error { // DisableSecOpt returns a security opt that can disable labeling // support for future container processes func DisableSecOpt() []string { - // TODO the selinux.DisableSecOpt stub returns []string{"disable"} instead of "nil" return nil } |