Changeset 13353 in vbox

Timestamp:

Oct 16, 2008 5:42:14 PM (16 years ago)

Author:

vboxsync

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

38053

Message:

Solaris/installer: Fail badly if any of the kernel stuff does not unload properly.

Location:

trunk/src/VBox/Installer/solaris

Files:

• postinstall.sh (modified) (1 diff)
• vboxdrv.sh (modified) (7 diffs)

trunk/src/VBox/Installer/solaris/postinstall.sh

@@ -31 +31 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    echo "Configuring VirtualBox Host kernel module(s)..."
+    echo "Configuring VirtualBox kernel module(s)..."
     /opt/VirtualBox/vboxdrv.sh stopall silentunload
-    /opt/VirtualBox/vboxdrv.sh start
     rc=$?
-    if test "$rc" -ne 0; then
-        echo "## Kernel module configuration failed! Aborting installation..."
-        exit 2
+    if test "$rc" -eq 0; then
+        /opt/VirtualBox/vboxdrv.sh start
+        rc=$?
+        if test "$rc" -eq 0; then
+            if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
+                /opt/VirtualBox/vboxdrv.sh fltstart
+                rc=$?            
+            fi
+        fi
     fi
 
-    if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
-        /opt/VirtualBox/vboxdrv.sh fltstart
+    # Fail on any errors while unloading previous modules because it makes it very hard to
+    # track problems when older vboxdrv is hanging about in memory and add_drv of the new
+    # one suceeds and it appears as though the new one is being used.
+    if test "$rc" -ne 0; then
+        echo "## Configuration failed. Aborting installation."
+        exit 2
     fi
 fi

trunk/src/VBox/Installer/solaris/vboxdrv.sh

@@ -18 +18 @@
 #
 
+STOPPING=""
 SILENTUNLOAD=""
 MODNAME="vboxdrv"
@@ -46 +47 @@
     fi
 
-    # Let us go a step further and check if user has mixed up x86/amd64
-    # amd64 ISA, x86 kernel module??
-    if test "$cputype" = "amd64"; then
-        modulepath="$MODDIR32/$MODNAME"
-        if test -f "$modulepath"; then
-            abort "Found 32-bit module instead of 64-bit. Please install the amd64 package!"
-        fi
-    else
-        # x86 ISA, amd64 kernel module??
-        modulepath="$MODDIR64/$MODNAME"
-        if test -f "$modulepath"; then
-            abort "Found 64-bit module instead of 32-bit. Please install the x86 package!"
-        fi
-    fi
-
-    abort "VirtualBox Host kernel module NOT installed."
+    # Check arch only if we are not stopping things (because rem_drv works for both arch.)
+    if test -z "$STOPPING"; then
+        # Let us go a step further and check if user has mixed up x86/amd64
+        # amd64 ISA, x86 kernel module??
+        if test "$cputype" = "amd64"; then
+            modulepath="$MODDIR32/$MODNAME"
+            if test -f "$modulepath"; then
+                abort "Found 32-bit module instead of 64-bit. Please install the amd64 package!"
+            fi
+        else
+            # x86 ISA, amd64 kernel module??
+            modulepath="$MODDIR64/$MODNAME"
+            if test -f "$modulepath"; then
+                abort "Found 64-bit module instead of 32-bit. Please install the x86 package!"
+            fi
+        fi
+
+        abort "VirtualBox Host kernel module NOT installed."
+    else
+        info "## VirtualBox Host kernel module NOT instaled."
+        return 0
+    fi
 }
 
@@ -130 +137 @@
 {
     if module_loaded; then
-        /usr/sbin/rem_drv $MODNAME || info "## WARNING!! Failed to unload VirtualBox Host kernel module. Old one still active!"
+        /usr/sbin/rem_drv $MODNAME || abort "Failed to unload VirtualBox Host kernel module. Old one still active!"
         info "VirtualBox Host kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then
@@ -139 +146 @@
     vbi_mod_id=`/usr/sbin/modinfo | grep vbi | cut -f 1 -d ' ' `
     if test -n "$vbi_mod_id"; then
-        /usr/sbin/modunload -i $vbi_mod_id > /dev/null 2>&1
+        /usr/sbin/modunload -i $vbi_mod_id > /dev/null 2>&1 || abort "Failed to unload VirtualBox kernel interfaces module. Old one still active!"
     fi
 }
@@ -148 +155 @@
         info "VirtualBox NetFilter kernel module already loaded."
     else
-        /usr/sbin/add_drv -m'* 0600 root sys' $FLTMODNAME
+        /usr/sbin/add_drv -m'* 0600 root sys' $FLTMODNAME || abort "Failed to load VirtualBox Host Kernel module."
         /usr/sbin/modload -p drv/$FLTMODNAME
         if test ! vboxflt_module_loaded; then
@@ -161 +168 @@
 {
     if vboxflt_module_loaded; then
-        /usr/sbin/rem_drv $FLTMODNAME || info "## WARNING!! Failed to unload VirtualBox NetFilter module. Old one still active!"
+        /usr/sbin/rem_drv $FLTMODNAME || abort "Failed to unload VirtualBox NetFilter module. Old one still active!"
         info "VirtualBox NetFilter kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then
@@ -198 +205 @@
 case "$1" in
 stopall)
+    STOPPING="stopping"
     stop_all_modules
     ;;