summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-14 20:49:45 +0100
committerGitHub <noreply@github.com>2020-02-14 20:49:45 +0100
commit3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e (patch)
tree7692f22e349a87af7067b6aedc1d6029ea25f501 /pkg
parent7e713ff336b8dd48b6fd75b16c92e6a35579355d (diff)
parentb4fa6f4f0819bcc0b85a5215564b937c374f315c (diff)
downloadpodman-3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e.tar.gz
podman-3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e.tar.bz2
podman-3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e.zip
Merge pull request #5207 from rhatdan/selinux
Fix SELinux labels of volumes
Diffstat (limited to 'pkg')
-rw-r--r--pkg/adapter/pods.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go
index a30ec6649..49f086ef3 100644
--- a/pkg/adapter/pods.go
+++ b/pkg/adapter/pods.go
@@ -565,8 +565,8 @@ func (r *LocalRuntime) PlayKubeYAML(ctx context.Context, c *cliconfig.KubePlayVa
return nil, errors.Errorf("Error creating HostPath %s at %s", volume.Name, hostPath.Path)
}
}
- // unconditionally label a newly created volume as private
- if err := libpod.LabelVolumePath(hostPath.Path, false); err != nil {
+ // Label a newly created volume
+ if err := libpod.LabelVolumePath(hostPath.Path); err != nil {
return nil, errors.Wrapf(err, "Error giving %s a label", hostPath.Path)
}
case v1.HostPathFileOrCreate:
@@ -579,8 +579,8 @@ func (r *LocalRuntime) PlayKubeYAML(ctx context.Context, c *cliconfig.KubePlayVa
logrus.Warnf("Error in closing newly created HostPath file: %v", err)
}
}
- // unconditionally label a newly created volume as private
- if err := libpod.LabelVolumePath(hostPath.Path, false); err != nil {
+ // unconditionally label a newly created volume
+ if err := libpod.LabelVolumePath(hostPath.Path); err != nil {
return nil, errors.Wrapf(err, "Error giving %s a label", hostPath.Path)
}
case v1.HostPathDirectory: