Changeset 36759 in vbox for trunk/src/VBox/Installer

Timestamp:

Apr 20, 2011 4:40:13 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71302

Message:

Additions/linux/Installer: use only pkexec, sudo and su for the autorun function

File:

• trunk/src/VBox/Installer/linux/runasroot.sh (modified) (2 diffs)

trunk/src/VBox/Installer/linux/runasroot.sh

@@ -57 +57 @@
 esac
 
-case "$DISPLAY" in ?*)
-    KDESUDO="`mywhich kdesudo`"
-    case "$KDESUDO" in ?*)
-        eval "`quotify "$KDESUDO"` --comment `quotify "$DESCRIPTION"` -- $COMMAND"
-        exit
+case "$HAS_TERMINAL" in "")
+    case "$DISPLAY" in ?*)
+        KDESUDO="`mywhich kdesudo`"
+        case "$KDESUDO" in ?*)
+            eval "`quotify "$KDESUDO"` --comment `quotify "$DESCRIPTION"` -- $COMMAND"
+            exit
+            ;;
+        esac
+
+        KDESU="`mywhich kdesu`"
+        case "$KDESU" in ?*)
+            "$KDESU" -c "$COMMAND"
+            exit
+            ;;
+        esac
+
+        GKSU="`mywhich gksu`"
+        case "$GKSU" in ?*)
+            # Older gksu does not grok --description nor '--' and multiple args.
+            # @todo which versions do?
+            # "$GKSU" --description "$DESCRIPTION" -- "$@"
+            # Note that $GKSU_SWITCHES is NOT quoted in the following
+            "$GKSU" $GKSU_SWITCHES "$COMMAND"
+            exit
+            ;;
+        esac
         ;;
-    esac
-
-    GKSU="`mywhich gksu`"
-    case "$GKSU" in ?*)
-        # Older gksu does not grok --description nor '--' and multiple args.
-        # @todo which versions do?
-        # "$GKSU" --description "$DESCRIPTION" -- "$@"
-        # Note that $GKSU_SWITCHES is NOT quoted in the following
-        "$GKSU" $GKSU_SWITCHES "$COMMAND"
-        exit
-        ;;
-    esac
+    esac # $DISPLAY
     ;;
-esac # $DISPLAY
+esac # ! $HAS_TERMINAL
 
 # pkexec may work for ssh console sessions as well if the right agents
@@ -93 +103 @@
 
 case "$HAS_TERMINAL" in ?*)
+        USE_SUDO=
+        grep Ubuntu /etc/lsb-release && USE_SUDO=true
+        # On Ubuntu we need sudo instead of su.  Assume this works, and is only
+        # needed for Ubuntu until proven wrong.
+        case $USE_SUDO in true)
+            SUDO_COMMAND="`quotify "$SUDO"` -- $COMMAND"
+            eval "$SUDO_COMMAND"
+            exit
+            ;;
+        esac
+
     SU="`mywhich su`"
     case "$SU" in ?*)