aboutsummaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-02-04 15:07:44 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-02-05 09:50:07 +0100
commit821ef6486a63f7dcf7f120e4010bb4d6f1e65b9d (patch)
treed1ef66fae532882652289fb585769ea22cdcdbdf /libpod
parent4e1bcf30f3a519490f58d66bc0aef16676f61ae8 (diff)
downloadpodman-821ef6486a63f7dcf7f120e4010bb4d6f1e65b9d.tar.gz
podman-821ef6486a63f7dcf7f120e4010bb4d6f1e65b9d.tar.bz2
podman-821ef6486a63f7dcf7f120e4010bb4d6f1e65b9d.zip
fix logic when not creating a workdir
When resolving the workdir of a container, we may need to create unless the user set it explicitly on the command line. Otherwise, we just do a presence check. Unfortunately, there was a missing return that lead us to fall through into attempting to create and chown the workdir. That caused a regression when running on a read-only root fs. Fixes: #9230 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal_linux.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 6c9489a08..ba85a1f47 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -213,6 +213,7 @@ func (c *Container) resolveWorkDir() error {
// we need to return the full error.
return errors.Wrapf(err, "error detecting workdir %q on container %s", workdir, c.ID())
}
+ return nil
}
// Ensure container entrypoint is created (if required).