diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-06 11:11:29 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-09 23:38:45 +0200 |
| commit | 3ba3e1c7510d1780b6527a4aa52e40ac2c5b576a (patch) | |
| tree | cf643117c58e4ac9136ad21969e48ba57738c146 /pkg/spec | |
| parent | 2bf184aa019387de560bec60636ae5152f8b54ce (diff) | |
| download | podman-3ba3e1c7510d1780b6527a4aa52e40ac2c5b576a.tar.gz podman-3ba3e1c7510d1780b6527a4aa52e40ac2c5b576a.tar.bz2 podman-3ba3e1c7510d1780b6527a4aa52e40ac2c5b576a.zip | |
systemd: expect full path /usr/sbin/init
"init" is a quite common name for the command executed in a container
image and Podman ends up using the systemd mode also when not
required.
Be stricter on enabling the systemd mode and not enable it
automatically when the basename is "init" but expect the full path
"/usr/sbin/init".
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/createconfig.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index a65263b7d..3685450f0 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -195,8 +195,7 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l if c.Interactive { options = append(options, libpod.WithStdin()) } - if c.Systemd && (strings.HasSuffix(c.Command[0], "init") || - strings.HasSuffix(c.Command[0], "systemd")) { + if c.Systemd { options = append(options, libpod.WithSystemd()) } if c.Name != "" { |