Changeset 58090 in vbox for trunk

Timestamp:

Oct 7, 2015 12:49:43 PM (9 years ago)

Author:

vboxsync

Message:

Installers/linux: provide clean-up mechanism for upgrade hiccups from 5.0.4 and earlier to later versions.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/main.cpp (modified) (2 diffs)
• Installer/linux/VBox.sh (modified) (2 diffs)
• Installer/linux/debian/postinst.in (modified) (5 diffs)
• Installer/linux/debian/templates (modified) (6 diffs)
• Installer/linux/install.sh (modified) (2 diffs)
• Installer/linux/postinst-common.sh (modified) (2 diffs)
• Installer/linux/prerm-common.sh (modified) (1 diff)
• Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (3 diffs)
• VMM/VMMR3/VM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -103 +103 @@
     "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
     "module by executing<br/><br/>"
-    "  <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
+    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
     "as root. If it is available in your distribution, you should install the "
     "DKMS package first. This package keeps track of Linux kernel changes and "
@@ -120 +120 @@
     "VirtualBox. The installation of VirtualBox was apparently not "
     "successful. Executing<br/><br/>"
-    "  <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
+    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
     "may correct this. Make sure that you do not mix the "
     "OSE version and the PUEL version of VirtualBox."

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

@@ -41 +41 @@
          load. Please recompile the kernel module and install it by
 
-           sudo /sbin/rcvboxdrv setup
+           sudo /sbin/vboxconfig
 
          You will not be able to start VMs until this problem is fixed.
@@ -49 +49 @@
 WARNING: The character device /dev/vboxdrv does not exist. Try
 
-           sudo /sbin/rcvboxdrv restart
+           sudo /sbin/vboxconfig
 
          and if that is not successful, try to re-install the package.

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -83 +83 @@
 
 if test "${INSTALL_NO_VBOXDRV}" = 1; then
-  POSTINST_START=
+  POSTINST_START=--nostart
   # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules
   if [ "$1" = "configure" ]; then
@@ -92 +92 @@
   fi
 else
-  POSTINST_START=--start
+  POSTINST_START=
   # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
   if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
@@ -102 +102 @@
 though module compilation denied by debconf setting.
 EOF
-        POSTINST_START=
+        POSTINST_START=--nostart
       else
         db_input low virtualbox/module-compilation-allowed || true
@@ -108 +108 @@
         db_get virtualbox/module-compilation-allowed
         if [ "$RET" = "false" ]; then
-          POSTINST_START=
+          POSTINST_START=--nostart
         fi
       fi
@@ -117 +117 @@
 # Install and start the new service scripts.
 /usr/lib/virtualbox/prerm-common.sh || true
-/usr/lib/virtualbox/postinst-common.sh /usr/lib/virtualbox "${POSTINST_START}" > /dev/null || true
+/usr/lib/virtualbox/postinst-common.sh ${POSTINST_START} > /dev/null || true
 
 exit 0

trunk/src/VBox/Installer/linux/debian/templates

@@ -17 +17 @@
  by 'uname -r') and execute
    
-   /sbin/rcvboxdrv setup
+   /sbin/vboxconfig
    
  as root.
@@ -28 +28 @@
  'uname -r' herausfinden können) und führen Sie danach
    
-   /sbin/rcvboxdrv setup
+   /sbin/vboxconfig
    
  mit Root-Rechten aus.
@@ -46 +46 @@
  build the module later by executing
    
-   /sbin/rcvboxdrv setup
+   /sbin/vboxconfig
    
  as root.
@@ -60 +60 @@
  später compilieren, indem Sie
    
-   /sbin/rcvboxdrv setup
+   /sbin/vboxconfig
    
  mit Root-Rechten ausführen.
@@ -72 +72 @@
  of the module later by executing
    
-   /sbin/rcvboxdrv setup
+   /sbin/vboxconfig
    
  as root.
@@ -80 +80 @@
  des Kernmoduls können Sie später durch
    
-   /sbin/rcvboxdrv setup
+   /sbin/vboxconfig
    
  erzwingen.

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

@@ -367 +367 @@
     # script set-up.
     if test "${BUILD_MODULE}" = "true"; then
-      START_SERVICES="--start"
+      START_SERVICES=
     else
-      START_SERVICES=
-    fi
-    ./postinst-common.sh "${INSTALLATION_DIR}" "${START_SERVICES}" >> "${LOG}"
+      START_SERVICES="--nostart"
+    fi
+    "${INSTALLATION_DIR}/postinst-common.sh" ${START_SERVICES} >> "${LOG}"
 
     info ""
@@ -380 +380 @@
         info "VirtualBox has been installed successfully, but the kernel module could not"
         info "be built.  When you have fixed the problems preventing this, execute"
-        info "  /sbin/rcvboxdrv setup"
+        info "  /sbin/vboxconfig"
         info "as administrator to build it."
     fi

trunk/src/VBox/Installer/linux/postinst-common.sh

@@ -27 +27 @@
 . "./routines.sh"
 
-START=
-TARGET=
-for i in "$@"
-do
-    case "${i}" in
-        --start)
-            START=true
+START=true
+TARGET="${MY_PATH}"
+while test -n "${1}"; do
+    case "${1}" in
+        --nostart)
+            START=
             ;;
         *)
-            if test -z "${TARGET}" && test -d "${i}"; then
-                TARGET="${i}"
-            else
-                echo "Bad argument ${i}" >&2
-                exit 1
-            fi
+            echo "Bad argument ${1}" >&2
+            exit 1
             ;;
     esac
+    shift
 done
-
-if test -z "${TARGET}"; then
-    echo "$0: no installation target specified." >&2
-    exit 1
-fi
 
 # Remove any traces of DKMS from previous installations.
@@ -71 +62 @@
 addrunlevel vboxweb-service
 
+ln -sf "${MY_PATH}/postinst-common.sh" /sbin/vboxconfig
+
 test -n "${START}" &&
 {

trunk/src/VBox/Installer/linux/prerm-common.sh

@@ -58 +58 @@
 delrunlevel vboxnet 2>/dev/null
 remove_init_script vboxnet 2>/dev/null
+rm -f /sbin/vboxconfig
 exit 0

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -291 +291 @@
 # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
 if test "${INSTALL_NO_VBOXDRV}" = 1; then
-  POSTINST_START=
+  POSTINST_START=--nostart
   if lsmod | grep -q "vboxdrv[^_-]"; then
     /usr/lib/virtualbox/vboxdrv.sh stop || true
@@ -301 +301 @@
   rm -f /lib/modules/*/misc/vboxpci.ko
 else
-  POSTINST_START=--start
+  POSTINST_START=
   if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
     # compile problem
@@ -313 +313 @@
 # Install and start the new service scripts.
 /usr/lib/virtualbox/prerm-common.sh || true
-/usr/lib/virtualbox/postinst-common.sh /usr/lib/virtualbox "${POSTINST_START}" > /dev/null || true
+/usr/lib/virtualbox/postinst-common.sh ${POSTINST_START} > /dev/null || true
 
 

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -316 +316 @@
                                   "that no kernel modules from an older version of VirtualBox exist. "
                                   "Then try to recompile and reload the kernel modules by executing "
-                                  "'/sbin/rcvboxdrv setup' as root");
+                                  "'/sbin/vboxconfig' as root");
                     break;
 #endif
@@ -382 +382 @@
                                   "was either not loaded or /dev/vboxdrv is not set up properly. "
                                   "Re-setup the kernel module by executing "
-                                  "'/sbin/rcvboxdrv setup' as root");
+                                  "'/sbin/vboxconfig' as root");
 #else
                     pszError = N_("VirtualBox kernel driver not loaded");
@@ -424 +424 @@
                                   "was either not loaded or /dev/vboxdrv was not created for some "
                                   "reason. Re-setup the kernel module by executing "
-                                  "'/sbin/rcvboxdrv setup' as root");
+                                  "'/sbin/vboxconfig' as root");
 #else
                     pszError = N_("VirtualBox kernel driver not installed");