From 7abf46d15e473a5bb2ec3c0646b7bbcdd5f59ef5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 3 Oct 2018 16:49:42 +0200 Subject: 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 --- libpod/container_internal.go | 9 --------- 1 file changed, 9 deletions(-) (limited to 'libpod/container_internal.go') 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 } -- cgit v1.2.3-54-g00ecf