containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12685 from mheon/handle_nil_passwd 

Always run passwd management code when DB value is nil
This commit is contained in:
OpenShift Merge Robot 2021-12-22 23:58:08 +01:00 committed by GitHub
parent 2aea0a5e9b af1dbbfb75
commit 74a58faf2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal_linux.go
View File

@ -1763,7 +1763,7 @@ func (c *Container) makeBindMounts() error {
// SHM is always added when we mount the container // SHM is always added when we mount the container
c.state.BindMounts["/dev/shm"] = c.config.ShmDir 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() newPasswd, newGroup, err := c.generatePasswdAndGroup()
if err != nil { if err != nil {
return errors.Wrapf(err, "error creating temporary passwd file for container %s", c.ID()) return errors.Wrapf(err, "error creating temporary passwd file for container %s", c.ID())