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

Timestamp:

Sep 30, 2008 11:23:19 AM (17 years ago)

Author:

vboxsync

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

37187

Message:

Solaris/installer: less verbose, don't bail out while unloading previous module and leave vboxflt behind.

Location:

trunk/src/VBox/Installer/solaris

Files:

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

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

@@ -30 +30 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    echo "Configuring VirtualBox Host kernel module..."
+    echo "Configuring VirtualBox kernel module(s)..."
     /opt/VirtualBox/vboxdrv.sh stopall silentunload
     /opt/VirtualBox/vboxdrv.sh start
 
     if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
-        echo "Configuring VirtualBox NetFilter kernel module..."
         /opt/VirtualBox/vboxdrv.sh fltstart
     fi

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

@@ -26 +26 @@
 abort()
 {
-    echo 1>&2 "$1"
+    echo 1>&2 "## $1"
     exit 1
 }
@@ -51 +51 @@
         modulepath="$MODDIR32/$MODNAME"
         if test -f "$modulepath"; then
-            abort "## Found 32-bit module instead of 64-bit. Please install the amd64 package!"
+            abort "Found 32-bit module instead of 64-bit. Please install the amd64 package!"
         fi
     else
@@ -57 +57 @@
         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."
+            abort "Found 64-bit module instead of 32-bit. Please install the x86 package!"
+        fi
+    fi
+
+    abort "VirtualBox Host kernel module NOT installed."
 }
 
@@ -108 +108 @@
         fi
         if test ! module_loaded; then
-            abort "## Failed to load VirtualBox Host kernel module."
+            abort "Failed to load VirtualBox Host kernel module."
         elif test -c "/devices/pseudo/$MODNAME@0:$MODNAME"; then
             info "VirtualBox Host kernel module loaded."
@@ -120 +120 @@
 {
     if module_loaded; then
-        /usr/sbin/rem_drv $MODNAME || abort "## Failed to unload VirtualBox Host kernel module."
+        /usr/sbin/rem_drv $MODNAME || info "## WARNING!! Failed to unload VirtualBox Host kernel module. Old one still active!"
         info "VirtualBox Host kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then
@@ -129 +129 @@
     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
+        /usr/sbin/modunload -i $vbi_mod_id > /dev/null 2>&1
     fi
 }
@@ -141 +141 @@
         /usr/sbin/modload -p drv/$FLTMODNAME
         if test ! vboxflt_module_loaded; then
-            abort "## Failed to load VirtualBox NetFilter kernel module."
+            abort "Failed to load VirtualBox NetFilter kernel module."
         else
             info "VirtualBox NetFilter kernel module loaded."
@@ -151 +151 @@
 {
     if vboxflt_module_loaded; then
-        /usr/sbin/rem_drv $FLTMODNAME || abort "## Failed to unload VirtualBox NetFilter module."
+        /usr/sbin/rem_drv $FLTMODNAME || info "## WARNING!! Failed to unload VirtualBox NetFilter module. Old one still active!"
         info "VirtualBox NetFilter kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then