opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 06:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4267 from giuseppe/accept-sbin-init

Browse Source 
systemd: accept also /sbin/init
This commit is contained in:
OpenShift Merge Robot
2019-10-15 13:10:01 +02:00
committed by GitHub
parent a032ff5cb7 38a6a2000a
commit e5de079714
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/shared/create.go
View File

@ -668,7 +668,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "cannot parse bool %s", c.String("systemd")) 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 systemd = true
} }
} }

9
docs/podman-create.1.md
View File

@ -716,12 +716,11 @@ Run container in systemd mode. The default is *true*.
The value *always* enforces the systemd mode is enforced without The value *always* enforces the systemd mode is enforced without
looking at the executable name. Otherwise, if set to true and the looking at the executable name. Otherwise, if set to true and the
command you are running inside the container is systemd or command you are running inside the container is systemd, /usr/sbin/init
/usr/sbin/init. or /sbin/init.
If the command you are running inside of the container is systemd or If the command you are running inside of the container is systemd,
/usr/sbin/init, Podman will setup tmpfs mount points in the following Podman will setup tmpfs mount points in the following directories:
directories:
/run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal /run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal

9
docs/podman-run.1.md
View File

@ -753,12 +753,11 @@ Run container in systemd mode. The default is *true*.
The value *always* enforces the systemd mode is enforced without The value *always* enforces the systemd mode is enforced without
looking at the executable name. Otherwise, if set to true and the looking at the executable name. Otherwise, if set to true and the
command you are running inside the container is systemd or command you are running inside the container is systemd, /usr/sbin/init
/usr/sbin/init. or /sbin/init.
If the command you are running inside of the container is systemd or If the command you are running inside of the container is systemd
/usr/sbin/init, Podman will setup tmpfs mount points in the following Podman will setup tmpfs mount points in the following directories:
directories:
/run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal /run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal