diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-10 14:58:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 14:58:41 -0700 |
| commit | fd389d28ce2223550c82d809cbafa12a54e733e6 (patch) | |
| tree | af13237275b82f7635ee06e2d079c7630926cdd5 /cmd/podman/common.go | |
| parent | cec8edd6f5067ea8336fe9d386b78ed1e7161fd6 (diff) | |
| parent | 5963077e93937046b6b13d6f1da8c1f932c0e6ff (diff) | |
| download | podman-fd389d28ce2223550c82d809cbafa12a54e733e6.tar.gz podman-fd389d28ce2223550c82d809cbafa12a54e733e6.tar.bz2 podman-fd389d28ce2223550c82d809cbafa12a54e733e6.zip | |
Merge pull request #4206 from giuseppe/systemd-mode-look-full-path
systemd: expect full path /usr/sbin/init
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 2a3f8f3ad..e93586b62 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -455,9 +455,9 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "sysctl", []string{}, "Sysctl options (default [])", ) - createFlags.Bool( - "systemd", cliconfig.DefaultSystemD, - "Run container in systemd mode if the command executable is systemd or init", + createFlags.String( + "systemd", "true", + `Run container in systemd mode ("true"|"false"|"always" (default "true")`, ) createFlags.StringArray( "tmpfs", []string{}, |