summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-05-17 15:35:20 -0400
committerGitHub <noreply@github.com>2021-05-17 15:35:20 -0400
commitf65d9309cbe8ccbacb64fc720d99d78c14ef4139 (patch)
tree7a933ec9abfab6f7dd7dec61dd6c7550f4c0451b
parent0a3444613e5eed3322d2b44cdc94a5ab9678768b (diff)
parentb75bb4665e1c4db2bb3b931af04c099deec0f666 (diff)
downloadpodman-f65d9309cbe8ccbacb64fc720d99d78c14ef4139.tar.gz
podman-f65d9309cbe8ccbacb64fc720d99d78c14ef4139.tar.bz2
podman-f65d9309cbe8ccbacb64fc720d99d78c14ef4139.zip
Merge pull request #10270 from rhatdan/mtab
Create the /etc/mtab file if does not exists
-rw-r--r--libpod/container_internal.go10
-rw-r--r--libpod/diff.go5
-rw-r--r--test/system/030-run.bats14
3 files changed, 27 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 53b85a466..9af652409 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1530,6 +1530,16 @@ func (c *Container) mountStorage() (_ string, deferredErr error) {
}()
}
+ // If /etc/mtab does not exist in container image, then we need to
+ // create it, so that mount command within the container will work.
+ mtab := filepath.Join(mountPoint, "/etc/mtab")
+ if err := os.MkdirAll(filepath.Dir(mtab), 0755); err != nil {
+ return "", errors.Wrap(err, "error creating mtab directory")
+ }
+ if err = os.Symlink("/proc/mounts", mtab); err != nil && !os.IsExist(err) {
+ return "", err
+ }
+
// Request a mount of all named volumes
for _, v := range c.config.NamedVolumes {
vol, err := c.mountNamedVolume(v, mountPoint)
diff --git a/libpod/diff.go b/libpod/diff.go
index 6ce8d809a..c5a53478b 100644
--- a/libpod/diff.go
+++ b/libpod/diff.go
@@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
)
-var containerMounts = map[string]bool{
+var initInodes = map[string]bool{
"/dev": true,
"/etc/hostname": true,
"/etc/hosts": true,
@@ -17,6 +17,7 @@ var containerMounts = map[string]bool{
"/run/.containerenv": true,
"/run/secrets": true,
"/sys": true,
+ "/etc/mtab": true,
}
// GetDiff returns the differences between the two images, layers, or containers
@@ -36,7 +37,7 @@ func (r *Runtime) GetDiff(from, to string) ([]archive.Change, error) {
changes, err := r.store.Changes(fromLayer, toLayer)
if err == nil {
for _, c := range changes {
- if containerMounts[c.Path] {
+ if initInodes[c.Path] {
continue
}
rchanges = append(rchanges, c)
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 9a136ff13..e12c32ef5 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -690,4 +690,18 @@ json-file | f
run_podman rm $cid
}
+@test "podman run no /etc/mtab " {
+ tmpdir=$PODMAN_TMPDIR/build-test
+ mkdir -p $tmpdir
+
+ cat >$tmpdir/Dockerfile <<EOF
+FROM $IMAGE
+RUN rm /etc/mtab
+EOF
+ expected="'/etc/mtab' -> '/proc/mounts'"
+ run_podman build -t nomtab $tmpdir
+ run_podman run --rm nomtab stat -c %N /etc/mtab
+ is "$output" "$expected" "/etc/mtab should be created"
+}
+
# vim: filetype=sh