Changeset 25644 in vbox

Timestamp:

Jan 5, 2010 8:46:59 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: more compatible id usage.

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (3 diffs)

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

@@ -43 +43 @@
 BIN_SVCCFG=/usr/sbin/svccfg
 BIN_IFCONFIG=/sbin/ifconfig
+BIN_ID=/usr/bin/id
 
 # "vboxdrv" is also used in sed lines here (change those as well if it ever changes)
@@ -121 +122 @@
     BIN_IFCONFIG=`which ifconfig 2> /dev/null`
     BIN_SVCS=`which svcs 2> /dev/null`
-
+    BIN_ID=`which id 2> /dev/null`
+
+    check_bin_path "$BIN_ID"
     check_bin_path "$BIN_ADDDRV"
     check_bin_path "$BIN_REMDRV"
@@ -139 +142 @@
 check_root()
 {
-    idbin=/usr/xpg4/bin/id
-    if test ! -x "$idbin"; then
-        found=`which id 2> /dev/null`
-        if test ! -x "$found"; then
-            errorprint "Failed to find a suitable user id executable."
-            exit 1
-        else
-            idbin=$found
-        fi
-    fi
-
-    if test `$idbin -u` -ne 0; then
+    # Don't use "-u" option as some id binaries don't support it, instead
+    # rely on "uid=101(username) gid=10(groupname) groups=10(staff)" output
+    curuid=`$BIN_ID | cut -f 2 -d '=' | cut -f 1 -d '('`
+    if test "$curuid" -ne 0; then
         errorprint "This script must be run with administrator privileges."
         exit 1