diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-11-03 23:35:08 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-11-03 23:35:08 +0000 |
| commit | b029f180bc237219449bc4a1bea5e7f16b8a3f92 (patch) | |
| tree | 9c9535ecda96bd964ebc787e78f3baa549ddd86b | |
| parent | 6ef16c72e9b262d695a5d2662dc1999279cc1b22 (diff) | |
| download | initscripts-b029f180bc237219449bc4a1bea5e7f16b8a3f92.tar initscripts-b029f180bc237219449bc4a1bea5e7f16b8a3f92.tar.gz initscripts-b029f180bc237219449bc4a1bea5e7f16b8a3f92.tar.bz2 initscripts-b029f180bc237219449bc4a1bea5e7f16b8a3f92.tar.xz initscripts-b029f180bc237219449bc4a1bea5e7f16b8a3f92.zip | |
Modify the check for systemd to use a more standard method.
This uses the same technique as described in 'man sd_booted'
| -rwxr-xr-x | rc.d/rc.sysinit | 6 |
1 files 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 |