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

Timestamp:

May 2, 2008 6:58:04 AM (17 years ago)

Author:

vboxsync

Message:

Solaris installer: Cleanups, better output messages.

Location:

trunk/src/VBox/Installer/solaris

Files:

• postinstall.sh (modified) (2 diffs)
• vboxdrv.sh (modified) (6 diffs)

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

@@ -18 +18 @@
 #
 
-echo "Sun xVM VirtualBox - postinstall script"
-sync
-
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    echo "This script will setup and load the VirtualBox kernel module..."
-    # vboxdrv.sh would've been installed, we just need to call it.
+    echo "Configuring VirtualBox kernel module..."
     /opt/VirtualBox/vboxdrv.sh restart silentunload
 fi
@@ -30 +26 @@
 # create links
 echo "Creating links..."
-#/usr/sbin/installf -c none $PKGINST /dev/vboxdrv=../devices/pseudo/vboxdrv@0:vboxdrv s
 if test -f /opt/VirtualBox/VirtualBox; then
     /usr/sbin/installf -c none $PKGINST /usr/bin/VirtualBox=/opt/VirtualBox/VBox.sh s

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

@@ -18 +18 @@
 #
 
-VBOXDRVFILE=""
 SILENTUNLOAD=""
+MODNAME="vboxdrv"
+MODDIR32="/platform/i86pc/kernel/drv"
+MODDIR64=$MODDIR32/amd64
 
 abort()
@@ -32 +34 @@
 }
 
-get_module_path()
+check_if_installed()
 {
     cputype=`isainfo -k`
-    moduledir="/platform/i86pc/kernel/drv";
+    modulepath="$MODDIR32/$MODNAME"    
     if test "$cputype" = "amd64"; then
-        moduledir=$moduledir/amd64
+        modulepath="$MODDIR64/$MODNAME"
     fi
-    modulepath=$moduledir/vboxdrv
     if test -f "$modulepath"; then
-        VBOXDRVFILE="$modulepath"
-    else
-        VBOXDRVFILE=""
-    fi
-}
-
-check_if_installed()
-{
-    if test "$VBOXDRVFILE" -a -f "$VBOXDRVFILE"; then
         return 0
     fi
-    abort "VirtualBox kernel module (vboxdrv) not installed."
+    abort "VirtualBox kernel module NOT installed."
 }
 
@@ -58 +50 @@
 {
     if test -f "/etc/name_to_major"; then
-        loadentry=`cat /etc/name_to_major | grep vboxdrv`
+        loadentry=`cat /etc/name_to_major | grep $MODNAME`
     else
-        loadentry=`/usr/sbin/modinfo | grep vboxdrv`
+        loadentry=`/usr/sbin/modinfo | grep $MODNAME`
     fi
     if test -z "$loadentry"; then
@@ -78 +70 @@
 {
     if module_loaded; then
-        info "vboxdrv already loaded..."
+        info "VirtualBox kernel module already loaded."
     else
-        /usr/sbin/add_drv -m'* 0666 root sys' vboxdrv
+        /usr/sbin/add_drv -m'* 0666 root sys' $MODNAME
         if test ! module_loaded; then
-            abort "Failed to load vboxdrv."
-        elif test -c "/devices/pseudo/vboxdrv@0:vboxdrv"; then
-            info "Loaded vboxdrv."
+            abort "## Failed to load VirtualBox kernel module."
+        elif test -c "/devices/pseudo/$MODNAME@0:$MODNAME"; then
+            info "VirtualBox kernel module successfully loaded."
         else
-            stop
             abort "Aborting due to attach failure."
         fi
@@ -95 +86 @@
 {
     if module_loaded; then
-        /usr/sbin/rem_drv vboxdrv
-        info "Unloaded vboxdrv."
+        /usr/sbin/rem_drv $MODNAME || abort "## Failed to unload VirtualBox kernel module."
+        info "VirtualBox kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then
-        info "vboxdrv not loaded."
+        info "VirtualBox kernel module not loaded."
     fi
 }
@@ -113 +104 @@
 {
     if module_loaded; then
-        info "vboxdrv running."
+        info "Running."
     else
-        info "vboxdrv stopped."
+        info "Stopped."
     fi
 }
 
 check_root
-get_module_path
 check_if_installed