Changeset 62831 in vbox for trunk/src/VBox/Additions/linux/installer

Timestamp:

Aug 1, 2016 4:31:17 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109427

Message:

bugref:8480: Guest Additions: Cannot unload vboxguest on upgrade: moved run-inst.sh from the host installer tree back to the Additions installer tree where it belongs, changed it back from being a generic installer stub to the hard-coded Additions installer and hard-coded the order of Additions set-up and clean-up scripts to ensure that we only try to unload the kernel drivers after everything else has been shut down.

File:

• trunk/src/VBox/Additions/linux/installer/install.sh.in (moved) (moved from trunk/src/VBox/Installer/linux/run-inst.sh ) (6 diffs)

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -25 +25 @@
 
 # Note: These variable names must *not* clash with variables in $CONFIG_DIR/$CONFIG!
-PACKAGE="_PACKAGE_"
-PACKAGE_NAME="_PACKAGE_NAME_"
+PACKAGE="VBoxGuestAdditions"
+PACKAGE_NAME="VirtualBox Guest Additions"
 UNINSTALL="uninstall.sh"
 ROUTINES="routines.sh"
@@ -34 +34 @@
 BUILD_TYPE="_BUILDTYPE_"
 USERNAME="_USERNAME_"
-UNINSTALL_SCRIPTS="_UNINSTALL_SCRIPTS_"
+UNINSTALL_SCRIPTS="vboxadd-x11 vboxvfs vboxadd-timesync vboxadd-service vboxadd"
 
 INSTALLATION_DIR="/opt/$PACKAGE-$INSTALLATION_VER"
@@ -126 +126 @@
     if ! test "$1" = "force" ; then
         cat 1>&2 << EOF
-You appear to have a version of the _PACKAGE_ software
+You appear to have a version of the VirtualBox Guest Additions
 on your system which was installed from a different source or using a
 different type of installer.  If you installed it from a package from your
@@ -153 +153 @@
         remove_init_script "$i" 2>> "${LOGFILE}"
     done
-    for i in "/opt/$PACKAGE-"*/init/*; do
-      test -z "$NO_CLEANUP" && grep -q '^# *cleanup_script *$' "${i}" && "${i}" cleanup 1>&2 2>> "$LOGFILE"
+    for i in "/opt/$PACKAGE-"*/init; do
+      for j in $UNINSTALL_SCRIPTS; do
+        script="${i}/${j}"
+        test -x "${script}" && test -z "$NO_CLEANUP" &&
+          grep -q '^# *cleanup_script *$' "${script}" &&
+          "${script}" cleanup 1>&2 2>> "$LOGFILE"
+      done
     done
 
@@ -416 +421 @@
 
 # Install, set up and start init scripts
-for i in "$INSTALLATION_DIR/init/"*; do
+for i in "$INSTALLATION_DIR/init/vboxadd" "$INSTALLATION_DIR/init/vboxadd-service" \
+    "$INSTALLATION_DIR/init/vboxadd-x11"; do
   if test -r "$i"; then
     install_init_script "$i" "`basename "$i"`" 2>> "${LOGFILE}"
@@ -463 +469 @@
 
 # Stop and clean up all services
-for i in "$INSTALLATION_DIR/init/"*; do
+for i in "$INSTALLATION_DIR/init/vboxadd-x11" "$INSTALLATION_DIR/init/vboxadd-service" \
+    "$INSTALLATION_DIR/init/vboxadd"; do
     if test -r "\$i"; then
         stop_init_script "\`basename "\$i"\`" 2>> "${LOGFILE}"