diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-16 17:11:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:11:26 -0500 |
| commit | 50042120e947fc7aee601f0c65ea485daf604ee1 (patch) | |
| tree | 138cae165ce8de8e314aab456391b444b9673dc3 /libpod/container_internal_linux.go | |
| parent | 7bd1c1a2975f369e60dbd0357eb091cf6e3ccb17 (diff) | |
| parent | 5d1ec2960df41b15040534e6507932cc5cf83542 (diff) | |
| download | podman-50042120e947fc7aee601f0c65ea485daf604ee1.tar.gz podman-50042120e947fc7aee601f0c65ea485daf604ee1.tar.bz2 podman-50042120e947fc7aee601f0c65ea485daf604ee1.zip | |
Merge pull request #9240 from rhatdan/reset
Do not reset storage when running inside of a container
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 2360d0737..edbbefb55 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1627,7 +1627,7 @@ func (c *Container) makeBindMounts() error { // Make .containerenv if it does not exist if _, ok := c.state.BindMounts["/run/.containerenv"]; !ok { - var containerenv string + containerenv := c.runtime.graphRootMountedFlag(c.config.Spec.Mounts) isRootless := 0 if rootless.IsRootless() { isRootless = 1 @@ -1642,7 +1642,7 @@ id=%q image=%q imageid=%q rootless=%d -`, version.Version.String(), c.Name(), c.ID(), imageName, imageID, isRootless) +%s`, version.Version.String(), c.Name(), c.ID(), imageName, imageID, isRootless, containerenv) } containerenvPath, err := c.writeStringToRundir(".containerenv", containerenv) if err != nil { |