Changeset 25646 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Jan 5, 2010 9:36:37 AM (15 years ago)

Author:

vboxsync

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

56354

Message:

Solaris/Installer: fixed explicit unload of USB client driver.

Location:

trunk/src/VBox/Installer/solaris

Files:

• preremove.sh (modified) (1 diff)
• vboxconfig.sh (modified) (4 diffs)

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

@@ -20 +20 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    echo "Removing VirtualBox drivers and services..."
+    echo "Removing VirtualBox services and drivers..."
     /opt/VirtualBox/vboxconfig.sh --preremove
     if test "$?" -eq 0; then

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

@@ -193 +193 @@
     fi
 
-    loadentry=`cat /etc/name_to_major | grep $1`
+    # Add a space at end of module name to make sure we have a perfect match to avoid
+    # any substring matches: e.g "vboxusb" & "vboxusbmon"
+    loadentry=`cat /etc/name_to_major | grep "$1 "`
     if test -z "$loadentry"; then
         return 1
@@ -210 +212 @@
 
     modname=$1
-    # modinfo should now work properly since we prevent module autounloading
-    loadentry=`$BIN_MODINFO | grep $modname`
+    # modinfo should now work properly since we prevent module autounloading.
+    loadentry=`$BIN_MODINFO | grep "$modname "`
     if test -z "$loadentry"; then
         return 1
@@ -301 +303 @@
     moddesc=$2
     fatal=$3
-    modid=`$BIN_MODINFO | grep $modname | cut -f 1 -d ' ' `
+    modid=`$BIN_MODINFO | grep "$modname " | cut -f 1 -d ' ' `
     if test -n "$modid"; then
         $BIN_MODUNLOAD -i $modid
@@ -307 +309 @@
             subprint "Unloaded: $moddesc module"
         else
-            subprint "Unloading: $moddesc  ...FAILED!"
+            subprint "Unloading: $moddesc module ...FAILED!"
             if test "$fatal" = "$FATALOP"; then
                 exit 1