From c144039b963c0e220bdd662c61c67dc1bf1c3cc2 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 1 Sep 2010 12:34:58 +0200
Subject: fix detection of systemd with new cgroup location

---
 rc.d/init.d/functions | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rc.d')

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
-- 
cgit v1.2.1