diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-07 19:23:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 19:23:27 +0200 |
| commit | 54d16f3b5fc4210c7c46e4cca240f988fa5f39f5 (patch) | |
| tree | 5cd32e61758c7c43ed44b2529cafc8281b46a910 /pkg | |
| parent | cd084853b6187d8b236ea327818277cc02e0b916 (diff) | |
| parent | 6c6670f12a3e6b91c1ebb09e7d9e4f49f89dccc0 (diff) | |
| download | podman-54d16f3b5fc4210c7c46e4cca240f988fa5f39f5.tar.gz podman-54d16f3b5fc4210c7c46e4cca240f988fa5f39f5.tar.bz2 podman-54d16f3b5fc4210c7c46e4cca240f988fa5f39f5.zip | |
Merge pull request #6829 from rhatdan/keepid
Add username to /etc/passwd inside of container if --userns keep-id
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 566830cd8..09d6ba445 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -153,7 +153,9 @@ func namespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt *libpod. // User switch s.UserNS.NSMode { case specgen.KeepID: - if !rootless.IsRootless() { + if rootless.IsRootless() { + toReturn = append(toReturn, libpod.WithAddCurrentUserPasswdEntry()) + } else { // keep-id as root doesn't need a user namespace s.UserNS.NSMode = specgen.Host } |