From dd73525fd52b73e14351ec483acdacf178629e01 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 27 Sep 2018 15:30:43 -0400 Subject: 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 --- libpod/container_internal.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libpod') 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 } -- cgit v1.2.3-54-g00ecf