diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 15:42:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-17 15:42:30 +0200 |
commit | 38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3 (patch) | |
tree | 9f5cc3e43c361d15728580781e9bfd4a5a06372d /cmd/podman/common/specgen.go | |
parent | 4fb0f56063de13af53128be9da81027d988516be (diff) | |
parent | eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c (diff) | |
download | podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.tar.gz podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.tar.bz2 podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.zip |
Merge pull request #6622 from goochjj/podman_fix_init
Fix --init and --init-path
Diffstat (limited to 'cmd/podman/common/specgen.go')
-rw-r--r-- | cmd/podman/common/specgen.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 0b44ef544..c8d9888b7 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -563,6 +563,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string // we dont think these are in the spec // init - initbinary // initpath + s.Init = c.Init + s.InitPath = c.InitPath s.Stdin = c.Interactive // quiet // DeviceCgroupRules: c.StringSlice("device-cgroup-rule"), |