Changeset 7906 in vbox for trunk/src/VBox/Additions/solaris/Installer

Timestamp:

Apr 11, 2008 11:24:36 AM (17 years ago)

Author:

vboxsync

Message:

Solaris installer: host and guest side fixes for Solaris 10, Indiana DP2.

Location:

trunk/src/VBox/Additions/solaris/Installer

Files:

• postinstall.sh (modified) (1 diff)
• vboxguest.sh (modified) (6 diffs)

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

@@ -84 +84 @@
 
     # Some distros like Indiana have no xorg.conf, deal with this
-    if ! (test -f '/etc/X11/xorg.conf' -o -f '/etc/X11/.xorg.conf'); then
+    if test ! -f '/etc/X11/xorg.conf' && test ! -f '/etc/X11/.xorg.conf'; then
         mv -f $vboxadditions_path/solaris_xorg.conf /etc/X11/.xorg.conf
     fi

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

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 # innotek VirtualBox
 # VirtualBox Guest Additions kernel module control script for Solaris.
@@ -62 +62 @@
 check_root()
 {
-    if test `id -u` -ne 0; then
+    if test `/usr/xpg4/bin/id -u` -ne 0; then
         abort "This program must be run with administrator privileges.  Aborting"
     fi
 }
 
-start()
+start_module()
 {
     if module_loaded; then
@@ -73 +73 @@
     else
         /usr/sbin/add_drv -i'pci80ee,cafe' -m'* 0666 root sys' vboxguest
-        if ! module_loaded; then
+        if test ! module_loaded; then
             abort "Failed to load vboxguest."
         elif test -c "/devices/pci@0,0/pci80ee,cafe@4:vboxguest"; then
@@ -84 +84 @@
 }
 
-stop()
+stop_module()
 {
     if module_loaded; then
@@ -94 +94 @@
 }
 
-restart()
+restart_module()
 {
-    stop
+    stop_module
     sync
-    start
+    start_module
     return 0
 }
 
-status()
+status_module()
 {
     if module_loaded; then
@@ -121 +121 @@
 case "$1" in
 start)
-    start
+    start_module
     ;;
 stop)
-    stop
+    stop_module
     ;;
 restart)
-    restart
+    restart_module
     ;;
 status)
-    status
+    status_module
     ;;
 *)