diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal.go | 8 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index c88794212..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 } @@ -1286,7 +1286,7 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (exten } } - var allHooks map[string][]spec.Hook + allHooks := make(map[string][]spec.Hook) for _, hDir := range c.runtime.config.HooksDir { manager, err := hooks.New(ctx, []string{hDir}, []string{"poststop"}, lang) if err != nil { diff --git a/libpod/runtime.go b/libpod/runtime.go index fbd4c7529..988c418f3 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -395,7 +395,7 @@ func makeRuntime(runtime *Runtime) (err error) { } if !foundRuntime { return errors.Wrapf(ErrInvalidArg, - "could not find a working runc binary (configured options: %v)", + "could not find a working binary (configured options: %v)", runtime.config.RuntimePath) } |