diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-22 23:58:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-22 23:58:08 +0100 |
| commit | 74a58faf2a54a9a063efc69371af7d81d335ba21 (patch) | |
| tree | 57ade448b681b1ef3427ea19171c70bcc18f268b | |
| parent | 2aea0a5e9beb251dc1e8a0ab67fa1460c54194b9 (diff) | |
| parent | af1dbbfb75851ce58dc59104fed2854bf0d9d171 (diff) | |
| download | podman-74a58faf2a54a9a063efc69371af7d81d335ba21.tar.gz podman-74a58faf2a54a9a063efc69371af7d81d335ba21.tar.bz2 podman-74a58faf2a54a9a063efc69371af7d81d335ba21.zip | |
Merge pull request #12685 from mheon/handle_nil_passwd
Always run passwd management code when DB value is nil
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index edebe2393..0226f30c7 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1763,7 +1763,7 @@ func (c *Container) makeBindMounts() error { // SHM is always added when we mount the container c.state.BindMounts["/dev/shm"] = c.config.ShmDir - if c.config.Passwd != nil && *c.config.Passwd { + if c.config.Passwd == nil || *c.config.Passwd { newPasswd, newGroup, err := c.generatePasswdAndGroup() if err != nil { return errors.Wrapf(err, "error creating temporary passwd file for container %s", c.ID()) |