diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-15 13:10:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 13:10:01 +0200 |
| commit | e5de079714a72746c8bdc67bb9fc2f522edfefe1 (patch) | |
| tree | 4b0127055ea074289586efcc611bd012a0a1c786 /cmd/podman | |
| parent | a032ff5cb727dff7b94d11be16ada80d3ad91ca8 (diff) | |
| parent | 38a6a2000a7bfb98b436d906c3ffb6f8cdcc78d8 (diff) | |
| download | podman-e5de079714a72746c8bdc67bb9fc2f522edfefe1.tar.gz podman-e5de079714a72746c8bdc67bb9fc2f522edfefe1.tar.bz2 podman-e5de079714a72746c8bdc67bb9fc2f522edfefe1.zip | |
Merge pull request #4267 from giuseppe/accept-sbin-init
systemd: accept also /sbin/init
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/shared/create.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 7c56db8db..bf9410b72 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -668,7 +668,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. if err != nil { return nil, errors.Wrapf(err, "cannot parse bool %s", c.String("systemd")) } - if x && (command[0] == "/usr/sbin/init" || (filepath.Base(command[0]) == "systemd")) { + if x && (command[0] == "/usr/sbin/init" || command[0] == "/sbin/init" || (filepath.Base(command[0]) == "systemd")) { systemd = true } } |