Changeset 56859 in vbox for trunk/src/VBox/Installer

Timestamp:

Jul 8, 2015 12:29:34 PM (10 years ago)

Author:

vboxsync

Message:

Installers/linux: make systemd without sysvinit work.

File:

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

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

@@ -341 +341 @@
     ## Service name.
     name="${1}"
+    test -n "${name}" || \
+        { log "${self}: missing argument" && return 1; }
+    test -x "`which systemctl 2>/dev/null`" && \
+        { systemctl enable "${name}"; return; }
     if test -x "/etc/rc.d/init.d/${name}"
     then
@@ -352 +356 @@
     fi
     get_chkconfig_info "${init_d_path}/init.d/${name}" || return 1
-    if test -x "`which systemctl 2>/dev/null`"
-    then
-        systemctl enable "${name}"
     # Redhat based sysvinit systems
-    elif test -x "`which chkconfig 2>/dev/null`"
+    if test -x "`which chkconfig 2>/dev/null`"
     then
         chkconfig --add "${name}" || {
@@ -399 +400 @@
     ## Service name.
     name="${1}"
-    test ! -z "${name}" || \
+    test -n "${name}" || \
         { log "${self}: missing argument" && return 1; }
     if test -x "`which systemctl 2>/dev/null`"