aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2011-10-22 14:31:37 +0100
committerColin Guthrie <colin@mageia.org>2011-10-22 14:31:37 +0100
commit6c2302d094261bd710ce63e3b243322e6d187681 (patch)
tree1d8ad28143097c3893f74dedf76b169653d79156
parent81402d9bd7ebd62de0fb2cfeb35512859c015d5e (diff)
downloadinitscripts-6c2302d094261bd710ce63e3b243322e6d187681.tar
initscripts-6c2302d094261bd710ce63e3b243322e6d187681.tar.gz
initscripts-6c2302d094261bd710ce63e3b243322e6d187681.tar.bz2
initscripts-6c2302d094261bd710ce63e3b243322e6d187681.tar.xz
initscripts-6c2302d094261bd710ce63e3b243322e6d187681.zip
Ensure we disable speedboot when used with systemd.
Speedboot causes us problems with systemd that typically manifest themselves in user permission/ACL application issues, especially when combined with autologin.
-rwxr-xr-xrc.d/rc.sysinit7
1 files changed, 7 insertions, 0 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 6a626533..18368b08 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -80,6 +80,13 @@ if strstr "$cmdline" failsafe ; then
SPEEDBOOT=no
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
+fi
+
# Check if a possible DKMS display driver is queued to be built on this boot
# or an interfering driver was loaded by initrd.
if [ "$SPEEDBOOT" != "no" ] && [ -x /sbin/display_driver_helper ] && ! /sbin/display_driver_helper --check-speedboot; then