Changeset 58216 in vbox

Timestamp:

Oct 13, 2015 2:47:03 PM (9 years ago)

Author:

vboxsync

Message:

Installers/linux: detect Debian systems with systemd installed but not in use.

File:

• trunk/src/VBox/Installer/linux/routines.sh (modified) (4 diffs)

trunk/src/VBox/Installer/linux/routines.sh

@@ -166 +166 @@
     test -L "/sbin/rc${name}" && rm "/sbin/rc${name}"
     ln -s "${script}" "/sbin/rc${name}"
-    test -x "`which systemctl 2>/dev/null`" &&
-        { systemd_wrap_init_script "$script" "$name"; return; }
+    if test -x "`which systemctl 2>/dev/null`"; then
+        if ! test -L /sbin/init || ls -l /sbin/init | grep -q systemd; then
+            { systemd_wrap_init_script "$script" "$name"; return; }
+        fi
+    fi
     if test -d /etc/rc.d/init.d; then
         cp "${script}" "/etc/rc.d/init.d/${name}" &&
@@ -194 +197 @@
 }
 
+## Did we install a systemd service?
+systemd_service_installed()
+{
+    ## Name of service to test.
+    name="${1}"
+
+    test -f /lib/systemd/system/"${name}".service ||
+        test -f /usr/lib/systemd/system/"${name}".service
+}
+
 ## Perform an action on a service
 do_sysvinit_action()
@@ -205 +218 @@
     test ! -z "${name}" && test ! -z "${action}" ||
         { echo "${self}: missing argument" >&2; return 1; }
-    if test -x "`which systemctl 2>/dev/null`"; then
+    if systemd_service_installed "${name}"; then
         systemctl -q ${action} "${name}"
     elif test -x "`which service 2>/dev/null`"; then
@@ -266 +279 @@
     test -n "${name}" || \
         { echo "${self}: missing argument" >&2; return 1; }
-    test -x "`which systemctl 2>/dev/null`" && \
+    systemd_service_installed "${name}" && \
         { systemctl -q enable "${name}"; return; }
     if test -x "/etc/rc.d/init.d/${name}"; then