summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-02 10:34:32 -0700
committerGitHub <noreply@github.com>2018-10-02 10:34:32 -0700
commitb63b1f9cb638db4bc3fdf69a50857b6d04efb6d7 (patch)
tree816533ac26b238054279a20d9454917e0f692fb8 /libpod
parent506ae3650b906e920b0b04d5f1bbe15873a90da1 (diff)
parentdd73525fd52b73e14351ec483acdacf178629e01 (diff)
downloadpodman-b63b1f9cb638db4bc3fdf69a50857b6d04efb6d7.tar.gz
podman-b63b1f9cb638db4bc3fdf69a50857b6d04efb6d7.tar.bz2
podman-b63b1f9cb638db4bc3fdf69a50857b6d04efb6d7.zip
Merge pull request #1562 from mheon/update_install_instructions
Update docs to build a runc that works with systemd
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 0642c5aad..d909c5d17 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -927,7 +927,7 @@ func (c *Container) makeBindMounts() error {
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)
+ return errors.Wrapf(err, "error relabeling %q for container %q", newResolv, c.ID())
}
c.state.BindMounts["/etc/resolv.conf"] = newResolv
@@ -941,7 +941,7 @@ func (c *Container) makeBindMounts() error {
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)
+ return errors.Wrapf(err, "error relabeling %q for container %q", newHosts, c.ID())
}
c.state.BindMounts["/etc/hosts"] = newHosts
@@ -953,7 +953,7 @@ func (c *Container) makeBindMounts() error {
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)
+ return errors.Wrapf(err, "error relabeling %q for container %q", hostnamePath, c.ID())
}
c.state.BindMounts["/etc/hostname"] = hostnamePath
}