From e290867b025a531f2e895fcbae84cf1e3796ddbd Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 2 Sep 2013 16:40:38 +0200
Subject: [vbox] vbox.build: suid VirtualBox in Debian/Ubuntu branch

---
 remote/modules/vbox/vbox.build | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/vbox/vbox.build b/remote/modules/vbox/vbox.build
index fd2e0b0b..4ee2b2b9 100644
--- a/remote/modules/vbox/vbox.build
+++ b/remote/modules/vbox/vbox.build
@@ -102,6 +102,8 @@ build() {
 			pinfo "Unpacking deb ..."
 			cd build || perror "Cannot cd to build directory!"
 			dpkg -x ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL") . || perror "Could not unpack deb-archive!"
+			# VirtualBox needs to be suid-root:
+			chmod u+s ${MODULE_BUILD_DIR}/usr/lib/VirtualBox
 			;;
 		*) perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target" ;;
 	esac
-- 
cgit v1.2.3-55-g7522


From e1fabaccb73228fa0c1c0e9aef586f819415d7a0 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 2 Sep 2013 16:51:46 +0200
Subject: [debug] +su, +file

---
 remote/modules/debug/debug.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
index ba1f065e..7b040326 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/debug.conf
@@ -9,5 +9,7 @@ REQUIRED_BINARIES="
 	fc-query
 	xset
 	locale
+	su
+	file
 	@htop
 "
-- 
cgit v1.2.3-55-g7522


From 3fb3b58fab80b438312cc433ea5681f656e858c4 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 2 Sep 2013 18:41:16 +0200
Subject: [vbox] suid VirtualBox Path, +perror

---
 remote/modules/vbox/vbox.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vbox/vbox.build b/remote/modules/vbox/vbox.build
index 4ee2b2b9..48cfe8c2 100644
--- a/remote/modules/vbox/vbox.build
+++ b/remote/modules/vbox/vbox.build
@@ -103,7 +103,7 @@ build() {
 			cd build || perror "Cannot cd to build directory!"
 			dpkg -x ../src/vbox/$(basename "$REQUIRED_VBOXBASEURL") . || perror "Could not unpack deb-archive!"
 			# VirtualBox needs to be suid-root:
-			chmod u+s ${MODULE_BUILD_DIR}/usr/lib/VirtualBox
+			chmod u+s ${MODULE_BUILD_DIR}/usr/lib/virtualbox/VirtualBox || pwarning "(Debian/Ubuntu) Could not suid VirtualBox executable!"
 			;;
 		*) perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target" ;;
 	esac
-- 
cgit v1.2.3-55-g7522


From 89fe73872324255f6b6b2bb1a428506f89c037b7 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 2 Sep 2013 19:04:03 +0200
Subject: [vbox] udev-rule with ENV-PATH

---
 remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules b/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules
index 2b82a0fc..f2b99721 100644
--- a/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules
+++ b/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules
@@ -1,6 +1,6 @@
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
 KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb_device", ACTION=="add", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb_device", ACTION=="remove", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-- 
cgit v1.2.3-55-g7522