Changeset 8939 in vbox

Timestamp:

May 20, 2008 8:00:41 AM (17 years ago)

Author:

vboxsync

Message:

Solaris guest installer: cleanups and some changes.

Location:

trunk/src/VBox/Additions/solaris/Installer

Files:

• postinstall.sh (modified) (2 diffs)
• vboxguest.sh (modified) (5 diffs)
• vboxservice.xml (modified) (4 diffs)

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

@@ -18 +18 @@
 #
 
-echo "Sun xVM VirtualBox Guest Additions - postinstall script"
-echo "This script will setup and load the VirtualBox Guest kernel module..."
+echo "Configuring VirtualBox guest kernel module..."
 
 sync
@@ -33 +32 @@
 
 # create links
+echo "Creating links..."
 /usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s
 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBoxClient s

trunk/src/VBox/Additions/solaris/Installer/vboxguest.sh

@@ -18 +18 @@
 #
 
-VBOXGUESTFILE=""
 SILENTUNLOAD=""
+MODNAME="vboxguest"
+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/vboxguest
     if test -f "$modulepath"; then
-        VBOXGUESTFILE="$modulepath"
-    else
-        VBOXGUESTFILE=""
-    fi
-}
-
-check_if_installed()
-{
-    if test "$VBOXGUESTFILE" -a -f "$VBOXGUESTFILE"; then
         return 0
     fi
-    abort "VirtualBox kernel module (vboxguest) not installed."
+    abort "VirtualBox kernel module ($MODNAME) NOT installed."
 }
 
 module_loaded()
 {
-    loadentry=`cat /etc/name_to_major | grep vboxguest`
+    if test -f "/etc/name_to_major"; then
+        loadentry=`cat /etc/name_to_major | grep $MODNAME`
+    else
+        loadentry=`/usr/sbin/modinfo | grep $MODNAME`
+    fi
     if test -z "$loadentry"; then
         return 1
@@ -74 +70 @@
 {
     if module_loaded; then
-        info "vboxguest already loaded..."
+        info "VirtualBox guest kernel module already loaded."
     else
-        /usr/sbin/add_drv -i'pci80ee,cafe' -m'* 0666 root sys' vboxguest
+        /usr/sbin/add_drv -i'pci80ee,cafe' -m'* 0666 root sys' $MODNAME
         if test ! module_loaded; then
-            abort "Failed to load vboxguest."
-        elif test -c "/devices/pci@0,0/pci80ee,cafe@4:vboxguest"; then
-            info "Loaded vboxguest."
+            abort "## Failed to load VirtualBox guest kernel module."
+        elif test -c "/devices/pci@0,0/pci80ee,cafe@4:$MODNAME"; then
+            info "VirtualBox guest kernel module loaded."
         else
             stop
@@ -91 +87 @@
 {
     if module_loaded; then
-        /usr/sbin/rem_drv vboxguest
-        info "Unloaded vboxguest."
+        /usr/sbin/rem_drv $MODNAME || abort "## Failed to unload VirtualBox guest kernel module."
+        info "VirtualBox guest kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then
-        info "vboxguest not loaded."
+        info "VirtualBox guest kernel module not loaded."
     fi
 }
@@ -109 +105 @@
 {
     if module_loaded; then
-        info "vboxguest running."
+        info "Running."
     else
-        info "vboxguest stopped."
+        info "Stopped."
     fi
 }
 
 check_root
-get_module_path
 check_if_installed
 

trunk/src/VBox/Additions/solaris/Installer/vboxservice.xml

@@ -5 +5 @@
 #
      Copyright (C) 2008 Sun Microsystems, Inc.
-    
+
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -13 +13 @@
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-    
+
      Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
      Clara, CA 95054 USA or visit http://www.sun.com if you need
@@ -36 +36 @@
         grouping='require_all'
         restart_on='none'
-        type='service'> 
+        type='service'>
         <service_fmri value='svc:/milestone/devices:default' />
     </dependency>
@@ -47 +47 @@
         type='service'>
         <service_fmri value='svc:/system/filesystem/local:default' />
-    </dependency> 
+    </dependency>
 
     <exec_method