diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-10-03 16:49:42 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-10-03 16:54:28 +0200 |
| commit | 7abf46d15e473a5bb2ec3c0646b7bbcdd5f59ef5 (patch) | |
| tree | 967dbfc874825931093aa69758276d823c761891 /libpod/container_internal.go | |
| parent | 230edff5216d0a7cedeff06c891450f8691b5aa2 (diff) | |
| download | podman-7abf46d15e473a5bb2ec3c0646b7bbcdd5f59ef5.tar.gz podman-7abf46d15e473a5bb2ec3c0646b7bbcdd5f59ef5.tar.bz2 podman-7abf46d15e473a5bb2ec3c0646b7bbcdd5f59ef5.zip | |
selinux: drop superflous relabel
The same relabel is already done in writeStringToRundir so we don't
need to do it twice. The version in writeStringToRundir takes into
account the correct file path when using user namespaces.
Closes: https://github.com/containers/libpod/pull/1584
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/container_internal.go')
| -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 } |