From 5fc5b4eacb924a597611fe44dcb8e79a7f0b59ac Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 23 Mar 2018 09:28:45 -0400 Subject: Document .containerenv in manpages. Move it to /run. Signed-off-by: Matthew Heon Closes: #533 Approved by: baude --- libpod/container_internal.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libpod') diff --git a/libpod/container_internal.go b/libpod/container_internal.go index d70e5c13b..0b04cc81a 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -673,13 +673,14 @@ func (c *Container) makeBindMounts() error { } // Make .containerenv - if _, ok := c.state.BindMounts["/.containerenv"]; !ok { + // Empty file, so no need to recreate if it exists + if _, ok := c.state.BindMounts["/run/.containerenv"]; !ok { // Empty string for now, but we may consider populating this later containerenvPath, err := c.writeStringToRundir(".containerenv", "") if err != nil { return errors.Wrapf(err, "error creating containerenv file for container %s", c.ID()) } - c.state.BindMounts["/.containerenv"] = containerenvPath + c.state.BindMounts["/run/.containerenv"] = containerenvPath } return nil -- cgit v1.2.3-54-g00ecf