Changeset 36681 in vbox

Timestamp:

Apr 15, 2011 10:17:02 AM (14 years ago)

Author:

vboxsync

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

71184

Message:

Installers/linux: more autorun hacking

Location:

trunk/src/VBox

Files:

trunk/src/VBox/Additions/linux/installer/autorun.sh

-              r36658
+              r36681
             case "$gxtpath" in ?*)
                 TITLE="VirtualBox Guest Additions installation"
+                TITLE_QUOTED=`quotify "$TITLE"`
+                BINARY=`quotify $i`
+                exec /bin/sh "$path/runasroot.sh" \
+                    "$TITLE" \
+                    "$gxtpath $gxttitle $TITLE_QUOTED $gxtexec $BINARY --xwin" \
+                    "Please try running $i manually."
+               BINARY="`quotify "$i"`"
+                exec "$gxtpath" "$gxttitle" "$TITLE" "$gxtexec" "$path/runasroot.sh" --has-terminal "$TITLE" "$BINARY --xwin" "Please try running "\""$i"\"" manually."
                 exit
                 ;;

-              r36667
+              r36681
   exit 1
 fi
+HAS_TERMINAL=""
+case "$1" in "--has-terminal")
+    shift
+    HAS_TERMINAL="yes"
+    ;;
+esac
 case "$#" in "2"|"3")
 …
     esac
-    KDESU="`mywhich kdesu`"
-    case "$KDESU" in ?*)
-        "$KDESU" -c "$COMMAND"
-        exit
-        ;;
-    esac
     GKSU="`mywhich gksu`"
     case "$GKSU" in ?*)
 …
 # are installed.  However it is very generic and does not allow for any
 # custom messages.  Thus it comes after gksu.
+## @todo should we insist on either a display or a terminal?
+# case "$DISPLAY$HAS_TERMINAL" in ?*)
 PKEXEC="`mywhich pkexec`"
 case "$PKEXEC" in ?*)
     eval "\"$PKEXEC\" $COMMAND"
     exit
+    ;;
+esac
+#    ;;S
+#esac
+case "$HAS_TERMINAL" in ?*)
+    SU="`mywhich su`"
+    case "$SU" in ?*)
+        "$SU" - root -c "$COMMAND"
+        exit
+        ;;
+    esac
     ;;
 esac

Note: See TracChangeset for help on using the changeset viewer.