diff options
| author | Joseph Gooch <mrwizard@dok.org> | 2020-06-16 14:57:43 +0000 |
|---|---|---|
| committer | Joseph Gooch <mrwizard@dok.org> | 2020-06-16 17:37:39 +0000 |
| commit | eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c (patch) | |
| tree | cac643da5385b06261a361a8d32614de65243955 /cmd/podman/common | |
| parent | 0968f25988624699f2db559f0a984cf84c8a284f (diff) | |
| download | podman-eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c.tar.gz podman-eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c.tar.bz2 podman-eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c.zip | |
Fix --init and --init-path
Init properly passed into specgen
Allow --init with --systemd=true but not --systemd=always.
Signed-off-by: Joseph Gooch <mrwizard@dok.org>
Diffstat (limited to 'cmd/podman/common')
| -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"), |