From b029f180bc237219449bc4a1bea5e7f16b8a3f92 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 3 Nov 2011 23:35:08 +0000
Subject: Modify the check for systemd to use a more standard method.

This uses the same technique as described in 'man sd_booted'
---
 rc.d/rc.sysinit | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 6b1baf0f..be1985e6 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -87,8 +87,10 @@ fi
 # Check to see if systemd is used as the init system and disable speedboot as it
 # generally messes things up (manifests itself as user permission problems,
 # especially with autologins).
-if [ "$SPEEDBOOT" != "no" ] && [ -f /proc/1/comm ] && [ "$(cat /proc/1/comm)" = "systemd" ]; then
-  SPEEDBOOT=no
+if [ "$SPEEDBOOT" != "no" ]; then
+  if /bin/mountpoint -q /sys/fs/cgroup/systemd; then
+    SPEEDBOOT=no
+  fi
 fi
 
 # Check if a possible DKMS display driver is queued to be built on this boot
-- 
cgit v1.2.1