aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorPetr Lautrbach <plautrba@redhat.com>2010-09-01 12:34:58 +0200
committerBill Nottingham <notting@redhat.com>2010-09-02 11:15:47 -0400
commitc144039b963c0e220bdd662c61c67dc1bf1c3cc2 (patch)
treea1ef73956a98e08d31ae8e3651f575a6e5ea5473 /rc.d
parent486a05f663117d07773e23d8637c1c6b998dbcd5 (diff)
downloadinitscripts-c144039b963c0e220bdd662c61c67dc1bf1c3cc2.tar
initscripts-c144039b963c0e220bdd662c61c67dc1bf1c3cc2.tar.gz
initscripts-c144039b963c0e220bdd662c61c67dc1bf1c3cc2.tar.bz2
initscripts-c144039b963c0e220bdd662c61c67dc1bf1c3cc2.tar.xz
initscripts-c144039b963c0e220bdd662c61c67dc1bf1c3cc2.zip
fix detection of systemd with new cgroup location
Diffstat (limited to 'rc.d')
-rw-r--r--rc.d/init.d/functions3
1 files changed, 2 insertions, 1 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index b2f8c95c..fadfb8e7 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -13,7 +13,8 @@ umask 022
PATH="/sbin:/usr/sbin:/bin:/usr/bin"
export PATH
-if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && /bin/mountpoint -q /cgroup/systemd ; then
+if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && \
+ /bin/mountpoint -q /cgroup/systemd || /bin/mountpoint -q /sys/fs/cgroup/systemd ; then
case "$0" in
/etc/init.d/*|/etc/rc.d/init.d/*)
_use_systemctl=1