diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-03 09:36:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 09:36:13 -0700 |
| commit | 2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f (patch) | |
| tree | 967dbfc874825931093aa69758276d823c761891 | |
| parent | 230edff5216d0a7cedeff06c891450f8691b5aa2 (diff) | |
| parent | 7abf46d15e473a5bb2ec3c0646b7bbcdd5f59ef5 (diff) | |
| download | podman-2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f.tar.gz podman-2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f.tar.bz2 podman-2a3e3e7f25d9a7bbe5e6f3f35027ccbe6521961f.zip | |
Merge pull request #1584 from giuseppe/drop-superflous-relabel
selinux: drop superflous relabel
| -rw-r--r-- | libpod/container_internal.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 1e49673bf..71a3c4caf 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -939,9 +939,6 @@ func (c *Container) makeBindMounts() error { if err != nil { return errors.Wrapf(err, "error creating resolv.conf for container %s", c.ID()) } - if err = label.Relabel(newResolv, c.config.MountLabel, false); err != nil { - return errors.Wrapf(err, "error relabeling %q for container %q", newResolv, c.ID()) - } c.state.BindMounts["/etc/resolv.conf"] = newResolv // Make /etc/hosts @@ -953,9 +950,6 @@ func (c *Container) makeBindMounts() error { if err != nil { return errors.Wrapf(err, "error creating hosts file for container %s", c.ID()) } - if err = label.Relabel(newHosts, c.config.MountLabel, false); err != nil { - return errors.Wrapf(err, "error relabeling %q for container %q", newHosts, c.ID()) - } c.state.BindMounts["/etc/hosts"] = newHosts // Make /etc/hostname @@ -965,9 +959,6 @@ func (c *Container) makeBindMounts() error { if err != nil { return errors.Wrapf(err, "error creating hostname file for container %s", c.ID()) } - if err = label.Relabel(hostnamePath, c.config.MountLabel, false); err != nil { - return errors.Wrapf(err, "error relabeling %q for container %q", hostnamePath, c.ID()) - } c.state.BindMounts["/etc/hostname"] = hostnamePath } |