Changeset 11975 in vbox

Timestamp:

Sep 2, 2008 12:16:12 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/installer: fixes.

Location:

trunk/src/VBox/Installer/solaris

Files:

• postinstall.sh (modified) (1 diff)
• preremove.sh (modified) (1 diff)
• vboxdrv.sh (modified) (5 diffs)

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

@@ -31 +31 @@
 if test "$currentzone" = "global"; then
     echo "Configuring VirtualBox kernel module..."
-    /opt/VirtualBox/vboxdrv.sh restart silentunload
-    
+    /opt/VirtualBox/vboxdrv.sh stopall silentunload
+    /opt/VirtualBox/vboxdrv.sh start
+
     echo "Configuring VirtualBox NetFilter kernel module..."
     if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
-        /opt/VirtualBox/vboxdrv.sh fltrestart silentunload
+        /opt/VirtualBox/vboxdrv.sh fltstart
     fi
 fi

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

@@ -22 +22 @@
 
 # vboxdrv.sh would've been installed, we just need to call it.
-/opt/VirtualBox/vboxdrv.sh stop
+/opt/VirtualBox/vboxdrv.sh stopall
 
 # remove /dev/vboxdrv

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

@@ -117 +117 @@
 }
 
-restart_module()
-{
-    stop_module
-    sync
-    start_module
-    return 0
-}
-
 start_vboxflt()
 {
@@ -154 +146 @@
 }
 
-restart_vboxflt()
-{
-    stop_vboxflt
-    sync
-    start_vboxflt
-    return 0
-}
-
 status_module()
 {
@@ -169 +153 @@
         info "Stopped."
     fi
+}
+
+stop_all_modules()
+{
+    stop_vboxflt
+    stop_module
+}
+
+start_all_modules()
+{
+    start_module
+    start_vboxflt
 }
 
@@ -179 +175 @@
 
 case "$1" in
+stopall)
+    stop_all_modules
+    ;;
+startall)
+    start_all_modules
+    ;;
 start)
     start_module
@@ -185 +187 @@
     stop_module
     ;;
-restart)
-    restart_module
-    ;;
 status)
     status_module
     ;;
-fltrestart)
-    restart_vboxflt
+fltstart)
+    start_vboxflt
+    ;;
+fltstop)
+    stop_vboxflt
     ;;
 *)
-    echo "Usage: $0 {start|stop|restart|status|fltrestart}"
+    echo "Usage: $0 {start|stop|status|fltstart|fltstop|stopall|startall}"
     exit 1
 esac