Additions

Timestamp:

Apr 4, 2011 8:15:31 AM (14 years ago)

Author:

vboxsync

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

70939

Message:

Additions/linux/installer: expand auto-run somewhat

Location:

trunk/src/VBox/Additions

Files:

trunk/src/VBox/Additions/Makefile.kmk

r35719	r36518
185	185	GUESTADDITIONS_FILESPEC.linux.x86 = \
186	186	$(VBOX_LNX_ADD_X86_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run \
	187	runasroot.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/runasroot.sh \
187	188	autorun.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/autorun.sh
188	189	endif

-              r36463
+              r36518
 AutoRun-sh_INST = bin/additions/
 AutoRun-sh_MODE = a+rx,u+w
+AutoRun-sh_SOURCES = $(VBOX_REL_LNX_ADD_INST)autorun.sh
+AutoRun-sh_SOURCES = \
+        $(VBOX_REL_LNX_INST_SRC)runasroot.sh \
+        $(VBOX_REL_LNX_ADD_INST)autorun.sh

-              r31923
+              r36518
 # execute the installer
 if test "$ostype" = "Linux"; then
+    if test -f "$path/VBoxLinuxAdditions.run"; then
+      exec gksu /bin/sh "$path/VBoxLinuxAdditions.run"
+    fi
+    for i in "$path/VBoxLinuxAdditions.run" \
+        "$path/VBoxLinuxAdditions-$arch.run"; do
+        if test -f "$i"; then
+            exec /bin/sh "$path/runasroot.sh" \
+                "VirtualBox Guest Additions installation" "$i" \
+                "Please try running $i manually."
+        fi
+    done
     # else: unknown failure

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