diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-15 11:14:19 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-15 11:14:21 +0200 |
| commit | 38a6a2000a7bfb98b436d906c3ffb6f8cdcc78d8 (patch) | |
| tree | 87fe157c78589879bb4d5ee49d372fdef94ac85d | |
| parent | a9190dac36f3f220ddc65ad8295778d40566e61f (diff) | |
| download | podman-38a6a2000a7bfb98b436d906c3ffb6f8cdcc78d8.tar.gz podman-38a6a2000a7bfb98b436d906c3ffb6f8cdcc78d8.tar.bz2 podman-38a6a2000a7bfb98b436d906c3ffb6f8cdcc78d8.zip | |
systemd: accept also /sbin/init
it is a regression caused by
3ba3e1c7510d1780b6527a4aa52e40ac2c5b576a.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1761514
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -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 |