summaryrefslogtreecommitdiff
path: root/pkg/specgenutil
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2022-03-21 16:43:14 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2022-04-14 11:22:13 +0200
commit3f2939c2ef6d9867862f597751c12b14c74440a3 (patch)
tree4033f1a48052c0ab001a213c0ce8d54af6fab8da /pkg/specgenutil
parent15712c76fb198cec7509ff0cf401e357401d2d7d (diff)
downloadpodman-3f2939c2ef6d9867862f597751c12b14c74440a3.tar.gz
podman-3f2939c2ef6d9867862f597751c12b14c74440a3.tar.bz2
podman-3f2939c2ef6d9867862f597751c12b14c74440a3.zip
run, create: add --passwd-entry
It allows to customize the entry that is written to the `/etc/passwd` file when --passwd is used. Closes: https://github.com/containers/podman/issues/13185 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/specgenutil')
-rw-r--r--pkg/specgenutil/specgen.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index 7d4fca846..42b66d909 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -832,6 +832,11 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
if s.Passwd == nil {
s.Passwd = &t
}
+
+ if len(s.PasswdEntry) == 0 || len(c.PasswdEntry) != 0 {
+ s.PasswdEntry = c.PasswdEntry
+ }
+
return nil
}