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

Timestamp:

Jul 7, 2015 3:36:24 PM (10 years ago)

Author:

vboxsync

Message:

Installers/linux: do not depend on non-standard init script verbs.

Location:

trunk/src/VBox/Installer/linux

Files:

• install.sh (modified) (2 diffs)
• routines.sh (modified) (3 diffs)
• run-inst.sh (modified) (3 diffs)

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

@@ -376 +376 @@
 
     # Install runlevel scripts
-    # Note: vboxdrv is also handled by setup_init_script. This function will
-    #       use chkconfig to adjust the sequence numbers, therefore vboxdrv
-    #       numbers here should match the numbers in the vboxdrv.sh check
-    #       header!
     install_init_script vboxdrv.sh vboxdrv
     install_init_script vboxballoonctrl-service.sh vboxballoonctrl-service
@@ -480 +476 @@
         cur=`pwd`
         log ""
-        setup_init_script vboxdrv
+        ./vboxdrv.sh setup
         # Start VirtualBox kernel module
         if [ $RETVAL -eq 0 ] && ! start_init_script vboxdrv; then

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

@@ -239 +239 @@
     ## The action to perform, normally "start", "stop" or "status".
     action="${2}"
-    ## The optional expression to check for in the script before starting.
-    expression="${3}"
     test ! -z "${name}" && test ! -z "${action}" || \
         { log "${self}: missing argument" && return 1; }
@@ -253 +251 @@
         return 1
     fi
-    test -n "${expression}" && ! grep -q "${expression}" "${script}" && return 0
-    case "${action}" in
-    start|stop|reload|restart|try-restart|force-reload|status)
-        if test -x "`which service 2>/dev/null`"
-        then
-            service "${name}" ${action}
-        elif test -x "`which invoke-rc.d 2>/dev/null`"
-        then
-            invoke-rc.d "${name}" ${action}
-        else
-            "${script}" "${action}"
-        fi
-        ;;
-    *)
+    if test -x "`which service 2>/dev/null`"
+    then
+        service "${name}" ${action}
+    elif test -x "`which invoke-rc.d 2>/dev/null`"
+    then
+        invoke-rc.d "${name}" ${action}
+    else
         "${script}" "${action}"
-        ;;
-    esac
+    fi
 }
 
@@ -282 +272 @@
 {
     do_sysvinit_action "${1}" stop
-}
-
-## Do initial setup of an installed service
-setup_init_script()
-{
-    do_sysvinit_action "${1}" setup '^# *setup_script *$'
-}
-
-## Do pre-removal cleanup of an installed service
-cleanup_init_script()
-{
-    do_sysvinit_action "${1}" cleanup '^# *cleanup_script *$'
 }
 

trunk/src/VBox/Installer/linux/run-inst.sh

@@ -151 +151 @@
     for i in $UNINSTALL_SCRIPTS; do
         stop_init_script "$i"
-        cleanup_init_script "$i" 1>&2 2>> "$LOGFILE"
-        test -x "./$i" && "./$i" cleanup 1>&2 2>> "$LOGFILE"
+        test -z "$NO_CLEANUP" && test -x "./$i" && "./$i" cleanup 1>&2 2>> "$LOGFILE"
         delrunlevel "$i"
         remove_init_script "$i"
+    done
+    for i in "/opt/$PACKAGE-"*/init/*; do
+      test -z "$NO_CLEANUP" && grep -q '^# *cleanup_script *$' "${i}" && "${i}" cleanup 1>&2 2>> "$LOGFILE"
     done
 
@@ -421 +423 @@
     install_init_script "$i" "`basename "$i"`"
     addrunlevel "`basename "$i"`"
-    test -n "$DO_SETUP" && setup_init_script "`basename "$i"`" 1>&2
+    test -n "$DO_SETUP" && grep -q '^# *setup_script *$' "${i}" && "${i}" setup 1>&2
     start_init_script "`basename "$i"`"
   fi
@@ -461 +463 @@
     if test -r "\$i"; then
         stop_init_script "\`basename "\$i"\`"
-        test -z "\$NO_CLEANUP" && cleanup_init_script "\`basename "\$i"\`" 2>> "\$LOGFILE"
+        test -z "\${NO_CLEANUP}" && grep -q '^# *cleanup_script *$' "\${i}" && "\${i}" cleanup 2>> "\$LOGFILE"
         delrunlevel "\`basename "\$i"\`"
         remove_init_script "\`basename "\$i"\`"