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 | |
| 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
| -rw-r--r-- | cmd/podman/shared/create.go | 2 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 9 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 9 |
3 files changed, 9 insertions, 11 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 } } diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 35602f97b..701f8b0fc 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -716,12 +716,11 @@ Run container in systemd mode. The default is *true*. The value *always* enforces the systemd mode is enforced without looking at the executable name. Otherwise, if set to true and the -command you are running inside the container is systemd or -/usr/sbin/init. +command you are running inside the container is systemd, /usr/sbin/init +or /sbin/init. -If the command you are running inside of the container is systemd or -/usr/sbin/init, Podman will setup tmpfs mount points in the following -directories: +If the command you are running inside of the container is systemd, +Podman will setup tmpfs mount points in the following directories: /run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index b2baae07a..602aa69ed 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -753,12 +753,11 @@ Run container in systemd mode. The default is *true*. The value *always* enforces the systemd mode is enforced without looking at the executable name. Otherwise, if set to true and the -command you are running inside the container is systemd or -/usr/sbin/init. +command you are running inside the container is systemd, /usr/sbin/init +or /sbin/init. -If the command you are running inside of the container is systemd or -/usr/sbin/init, Podman will setup tmpfs mount points in the following -directories: +If the command you are running inside of the container is systemd +Podman will setup tmpfs mount points in the following directories: /run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal |