diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-29 05:47:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 05:47:02 -0700 |
| commit | 9b789359f17f22bdd2ed49087c23eebf39f338f3 (patch) | |
| tree | 4ccdf7b1acd720ea0b0c4c92804afd63d9bd5b1f /libpod/runtime_volume_linux.go | |
| parent | 376a89c7a417e90bc667e11f7264e4a7ea950bfe (diff) | |
| parent | 0d0ad59641a308450d694d4c2fb95303c64fabf8 (diff) | |
| download | podman-9b789359f17f22bdd2ed49087c23eebf39f338f3.tar.gz podman-9b789359f17f22bdd2ed49087c23eebf39f338f3.tar.bz2 podman-9b789359f17f22bdd2ed49087c23eebf39f338f3.zip | |
Merge pull request #2575 from haircommander/hotfix_play_kube
Default to SELinux private label for play kube mounts
Diffstat (limited to 'libpod/runtime_volume_linux.go')
| -rw-r--r-- | libpod/runtime_volume_linux.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go index b51bb8213..5767a99e7 100644 --- a/libpod/runtime_volume_linux.go +++ b/libpod/runtime_volume_linux.go @@ -10,7 +10,6 @@ import ( "github.com/containers/libpod/libpod/events" "github.com/containers/storage/pkg/stringid" - "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -56,15 +55,8 @@ func (r *Runtime) newVolume(ctx context.Context, options ...VolumeCreateOption) if err := os.MkdirAll(fullVolPath, 0755); err != nil { return nil, errors.Wrapf(err, "error creating volume directory %q", fullVolPath) } - _, mountLabel, err := label.InitLabels([]string{}) - if err != nil { - return nil, errors.Wrapf(err, "error getting default mountlabels") - } - if err := label.ReleaseLabel(mountLabel); err != nil { - return nil, errors.Wrapf(err, "error releasing label %q", mountLabel) - } - if err := label.Relabel(fullVolPath, mountLabel, true); err != nil { - return nil, errors.Wrapf(err, "error setting selinux label to %q", fullVolPath) + if err := LabelVolumePath(fullVolPath, true); err != nil { + return nil, err } volume.config.MountPoint = fullVolPath |