diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-14 15:35:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 15:35:20 -0400 |
| commit | 6076e1a9a53a785d0053d22f1859103d5fea8b56 (patch) | |
| tree | 9901a7a5ac74c7a67763efd563fe07e08e08234f /pkg/specgenutil/specgen.go | |
| parent | 53b984f20fef3a66269029f10c6cd16d7b80fd4e (diff) | |
| parent | 3f2939c2ef6d9867862f597751c12b14c74440a3 (diff) | |
| download | podman-6076e1a9a53a785d0053d22f1859103d5fea8b56.tar.gz podman-6076e1a9a53a785d0053d22f1859103d5fea8b56.tar.bz2 podman-6076e1a9a53a785d0053d22f1859103d5fea8b56.zip | |
Merge pull request #13616 from giuseppe/passwd-entry
run, create: add --passwd-entry
Diffstat (limited to 'pkg/specgenutil/specgen.go')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 5 |
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 } |