Changeset 13446 in vbox for trunk/src

Timestamp:

Oct 21, 2008 2:09:01 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/Installer: fixes.

Location:

trunk/src/VBox/Installer/solaris

Files:

• preremove.sh (modified) (1 diff)
• vboxdrv.sh (modified) (6 diffs)

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

@@ -23 +23 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    # stop and unregister webservice SMF
-    /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
-    /usr/sbin/svccfg delete svc:/application/virtualbox/webservice:default
+    # stop and unregister webservice SMF (if present)
+    webservicefound=`svcs -a | grep "virtualbox/webservice"`
+    if test ! -z "$webservicefound"; then
+        /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
+        /usr/sbin/svccfg delete svc:/application/virtualbox/webservice:default
+    fi
 
     # stop and unregister zoneaccess SMF (if present)

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

@@ -21 +21 @@
 SILENTUNLOAD=""
 MODNAME="vboxdrv"
+VBIMODNAME="vbi"
 FLTMODNAME="vboxflt"
 MODDIR32="/platform/i86pc/kernel/drv"
@@ -73 +74 @@
 module_loaded()
 {
-    if test -f "/etc/name_to_major"; then
-        loadentry=`cat /etc/name_to_major | grep $MODNAME`
-    else
-        loadentry=`/usr/sbin/modinfo | grep $MODNAME`
-    fi
+    # modinfo should now work properly since we prevent module autounloading
+    loadentry=`/usr/sbin/modinfo | grep $MODNAME`
     if test -z "$loadentry"; then
         return 1
@@ -86 +84 @@
 vboxflt_module_loaded()
 {
-    if test -f "/etc/name_to_major"; then
-        loadentry=`cat /etc/name_to_major | grep $FLTMODNAME`
-    else
-        loadentry=`/usr/sbin/modinfo | grep $FLTMODNAME`
-    fi
+    # modinfo should now work properly since we prevent module autounloading
+    loadentry=`/usr/sbin/modinfo | grep $FLTMODNAME`
     if test -z "$loadentry"; then
         return 1
@@ -137 +132 @@
 {
     if module_loaded; then
-        /usr/sbin/rem_drv $MODNAME || abort "Failed to unload VirtualBox Host kernel module. Old one still active!"
-        info "VirtualBox Host kernel module unloaded."
+        vboxdrv_mod_id=`/usr/sbin/modinfo | grep $MODNAME | cut -f 1 -d ' ' `
+        if test -n "$vboxdrv_mod_id"; then
+            /usr/sbin/modunload -i $vboxdrv_mod_id
+            rc=$?
+            if test "$rc" -eq 0; then
+                /usr/sbin/rem_drv $MODNAME || abort "Unloaded VirtualBox Host kernel module, but failed to remove it."
+                info "VirtualBox Host kernel module unloaded."
+            else
+                abort "Failed to unload VirtualBox Host kernel module. Old one still active!!"
+            fi
+        fi
     elif test -z "$SILENTUNLOAD"; then
         info "VirtualBox Host kernel module not loaded."
@@ -144 +148 @@
 
     # check for vbi and force unload it
-    vbi_mod_id=`/usr/sbin/modinfo | grep vbi | cut -f 1 -d ' ' `
+    vbi_mod_id=`/usr/sbin/modinfo | grep $VBIMODNAME | cut -f 1 -d ' ' `
     if test -n "$vbi_mod_id"; then
-        /usr/sbin/modunload -i $vbi_mod_id > /dev/null 2>&1 || abort "Failed to unload VirtualBox kernel interfaces module. Old one still active!"
+        /usr/sbin/modunload -i $vbi_mod_id
     fi
 }
@@ -155 +159 @@
         info "VirtualBox NetFilter kernel module already loaded."
     else
-        /usr/sbin/add_drv -m'* 0600 root sys' $FLTMODNAME || abort "Failed to load VirtualBox NetFilter Kernel module."
+        /usr/sbin/add_drv -m'* 0600 root sys' $FLTMODNAME || abort "Failed to add VirtualBox NetFilter Kernel module."
         /usr/sbin/modload -p drv/$FLTMODNAME
         if test ! vboxflt_module_loaded; then