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

Timestamp:

Oct 1, 2008 11:20:49 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/installer: Fix for missing xpg4/bin/id and bail out installation when vboxdrv setup fails.

Location:

trunk/src/VBox/Installer/solaris

Files:

• postinstall.sh (modified) (1 diff)
• vboxdrv.sh (modified) (2 diffs)

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

@@ -33 +33 @@
     /opt/VirtualBox/vboxdrv.sh stopall silentunload
     /opt/VirtualBox/vboxdrv.sh start
+    rc=$?
+    if test "$rc" -ne 0; then
+        echo "## Kernel module configuration failed! Aborting installation..."
+        exit 2
+    fi
 
     if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then

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

@@ -92 +92 @@
 check_root()
 {
-    if test `/usr/xpg4/bin/id -u` -ne 0; then
+    idbin=/usr/xpg4/bin/id
+    if test ! -f "$idbin"; then
+        found=`which id | grep "no id"`
+        if test ! -z "$found"; then
+            abort "Failed to find a suitable user id binary! Aborting"
+        else
+            idbin=$found
+        fi
+    fi
+
+    if test `$idbin -u` -ne 0; then
         abort "This program must be run with administrator privileges.  Aborting"
     fi
@@ -213 +223 @@
 esac
 
-exit
-
+exit 0
+