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/shared/intermediate.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/shared/intermediate.go')
-rw-r--r-- | cmd/podman/shared/intermediate.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go index cccdd1bea..0f71dc087 100644 --- a/cmd/podman/shared/intermediate.go +++ b/cmd/podman/shared/intermediate.go @@ -449,7 +449,7 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes m["subgidname"] = newCRString(c, "subgidname") m["subuidname"] = newCRString(c, "subuidname") m["sysctl"] = newCRStringSlice(c, "sysctl") - m["systemd"] = newCRBool(c, "systemd") + m["systemd"] = newCRString(c, "systemd") m["tmpfs"] = newCRStringArray(c, "tmpfs") m["tty"] = newCRBool(c, "tty") m["uidmap"] = newCRStringSlice(c, "uidmap") |