diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-06-30 15:44:14 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-07-07 08:34:31 -0400 |
| commit | 6c6670f12a3e6b91c1ebb09e7d9e4f49f89dccc0 (patch) | |
| tree | 466d433075c1e746d459184fb28fee1d96546e62 /pkg/specgen/generate/namespaces.go | |
| parent | 1a93857acc4ee1e5a9213e2c22f12802d84cd277 (diff) | |
| download | podman-6c6670f12a3e6b91c1ebb09e7d9e4f49f89dccc0.tar.gz podman-6c6670f12a3e6b91c1ebb09e7d9e4f49f89dccc0.tar.bz2 podman-6c6670f12a3e6b91c1ebb09e7d9e4f49f89dccc0.zip | |
Add username to /etc/passwd inside of container if --userns keep-id
If I enter a continer with --userns keep-id, my UID will be present
inside of the container, but most likely my user will not be defined.
This patch will take information about the user and stick it into the
container.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/generate/namespaces.go')
| -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 } |