summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-09-27 15:30:43 -0400
committerMatthew Heon <matthew.heon@gmail.com>2018-10-01 10:23:06 -0400
commitdd73525fd52b73e14351ec483acdacf178629e01 (patch)
tree2a9554e246b579a9726446124695cb55e56925b6 /libpod
parentdf978a264d7944351e7cded0a9506cab8a7bb0db (diff)
downloadpodman-dd73525fd52b73e14351ec483acdacf178629e01.tar.gz
podman-dd73525fd52b73e14351ec483acdacf178629e01.tar.bz2
podman-dd73525fd52b73e14351ec483acdacf178629e01.zip
Update docs to build a runc that works with systemd
Runc disables systemd cgroup support when build statically, so don't tell people to do that now that we're defaulting to systemd for cgroup management. Also, fix some error messages to use the proper ID() call for containers. Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
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 c88794212..7136ef168 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
}