diff options
| author | Simon Rettberg | 2013-09-03 17:43:02 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-09-03 17:43:02 +0200 |
| commit | a52316d074d5c3f455b748cffe3af3072d0d36a6 (patch) | |
| tree | dc2c6750c342d1e248a2071ac2593d7f1bbde7c9 /remote/modules | |
| parent | Add consolekit and polkit (diff) | |
| parent | [pam-hso] activated pam-hso in configs of server (diff) | |
| download | tm-scripts-a52316d074d5c3f455b748cffe3af3072d0d36a6.tar.gz tm-scripts-a52316d074d5c3f455b748cffe3af3072d0d36a6.tar.xz tm-scripts-a52316d074d5c3f455b748cffe3af3072d0d36a6.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/debug/debug.conf | 2 | ||||
| -rw-r--r-- | remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules | 8 | ||||
| -rw-r--r-- | remote/modules/vbox/vbox.build | 2 |
3 files changed, 8 insertions, 4 deletions
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 " 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" diff --git a/remote/modules/vbox/vbox.build b/remote/modules/vbox/vbox.build index fd2e0b0b..48cfe8c2 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/VirtualBox || pwarning "(Debian/Ubuntu) Could not suid VirtualBox executable!" ;; *) perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target" ;; esac |