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

systemd: accept also /sbin/init
This commit is contained in:
OpenShift Merge Robot
2019-10-15 13:10:01 +02:00
committed by GitHub
3 changed files with 9 additions and 11 deletions

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
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

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
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