aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2020-07-25 13:54:57 +0200
committerOlav Vitters <olav@vitters.nl>2020-07-25 13:54:57 +0200
commit81b6ab4461c8f0a0b69246c7f5c4a3d1f99f6d21 (patch)
tree0595297fe92eb722128d65702d3f721e4ad5bc3a
parentd03bba16c0fbb41ffacd19285dc3765007e25085 (diff)
downloadrpm-helper-81b6ab4461c8f0a0b69246c7f5c4a3d1f99f6d21.tar
rpm-helper-81b6ab4461c8f0a0b69246c7f5c4a3d1f99f6d21.tar.gz
rpm-helper-81b6ab4461c8f0a0b69246c7f5c4a3d1f99f6d21.tar.bz2
rpm-helper-81b6ab4461c8f0a0b69246c7f5c4a3d1f99f6d21.tar.xz
rpm-helper-81b6ab4461c8f0a0b69246c7f5c4a3d1f99f6d21.zip
correctly check if systemd has booted
-rwxr-xr-xadd-service4
-rwxr-xr-xdel-service4
-rwxr-xr-xreread-services2
3 files changed, 5 insertions, 5 deletions
diff --git a/add-service b/add-service
index d04b4e5..571a54c 100755
--- a/add-service
+++ b/add-service
@@ -1,6 +1,6 @@
#!/bin/bash
#---------------------------------------------------------------
-# Project : Mandriva Linux
+# Project : Mageia Linux
# Module : rpm-helper
# File : add-service
# Version : $Id$
@@ -23,7 +23,7 @@ if [ $# -lt 3 ]; then
fi
# What init system are we currently using?
-if /bin/mountpoint -q /sys/fs/cgroup/systemd; then
+if [ -d /run/systemd/system/ ]; then
init=systemd
else
init=sysvinit
diff --git a/del-service b/del-service
index 55c26bf..ac1f7e7 100755
--- a/del-service
+++ b/del-service
@@ -1,6 +1,6 @@
#!/bin/sh
#---------------------------------------------------------------
-# Project : Mandriva Linux
+# Project : Mageia Linux
# Module : rpm-helper
# File : del-service
# Version : $Id$
@@ -23,7 +23,7 @@ if [ $# -lt 3 ]; then
fi
# What init system are we currently using?
-if /bin/mountpoint -q /sys/fs/cgroup/systemd; then
+if [ -d /run/systemd/system/ ]; then
init=systemd
else
init=sysvinit
diff --git a/reread-services b/reread-services
index 73092d6..635c9ff 100755
--- a/reread-services
+++ b/reread-services
@@ -16,7 +16,7 @@ if [ $# -lt 1 ]; then
fi
# What init system are we currently using?
-if /bin/mountpoint -q /sys/fs/cgroup/systemd; then
+if [ -d /run/systemd/system/ ]; then
init=systemd
else
init=sysvinit