diff options
author | Christian Rößler | 2015-07-16 16:27:51 +0200 |
---|---|---|
committer | Christian Rößler | 2015-07-16 16:27:51 +0200 |
commit | 8fe1c5123c7824444ed0ffbf47c0c01dc32cddc4 (patch) | |
tree | 79cb6309f403f4f01045b8c8bd2ed274ef7ec6a0 /remote | |
parent | Merge branch 'master' of 10.4.9.56:/root/tm-scripts (diff) | |
download | tm-scripts-8fe1c5123c7824444ed0ffbf47c0c01dc32cddc4.tar.gz tm-scripts-8fe1c5123c7824444ed0ffbf47c0c01dc32cddc4.tar.xz tm-scripts-8fe1c5123c7824444ed0ffbf47c0c01dc32cddc4.zip |
[vbox] Some more stuff: Now USB (but no working passthr.), VBox 5, USB2, USB Filters
Diffstat (limited to 'remote')
-rw-r--r-- | remote/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules (renamed from remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules) | 3 | ||||
-rwxr-xr-x | remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env | 5 | ||||
-rw-r--r-- | remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include | 7 | ||||
-rwxr-xr-x | remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include | 2 | ||||
-rw-r--r-- | remote/modules/vbox/module.conf | 6 | ||||
-rw-r--r-- | remote/modules/vbox/module.conf.ubuntu.14 | 3 |
6 files changed, 15 insertions, 11 deletions
diff --git a/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules b/remote/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules index d200d8f8..f2caa1cf 100644 --- a/remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules +++ b/remote/modules/vbox/data/etc/udev/rules.d/60-vboxdrv.rules @@ -1,5 +1,6 @@ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" -KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600" +KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666" +KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0660" SUBSYSTEM=="usb_device", ACTION=="add", ENV{PATH}="/usr/bin:/bin:/usr/sbin:/sbin:/opt/openslx/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/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/sbin", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env index 0a854136..83336a20 100755 --- a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env +++ b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env @@ -32,8 +32,9 @@ done # rmmod vboxpci vboxnetflt vboxnetadp vboxdrv #} -mknod -m 0660 /dev/vboxdrv c 10 59 -chown root:vboxusers /dev/vboxdrv +# Should be done by udev rule - no mknod needed. +# mknod -m 0660 /dev/vboxdrv c 10 59 +# chown root:vboxusers /dev/vboxdrv # pretty dumb you can just create host-only interfaces, but not assign a specific diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include index 48610aea..1f0b209a 100644 --- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include +++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include @@ -65,8 +65,11 @@ cat << EOF > "${machconfig}" <USB> <Controllers> <Controller name="OHCI" type="OHCI"/> - </Controllers> - <DeviceFilters/> + <Controller name="EHCI" type="EHCI"/> + </Controllers> + <DeviceFilters> + <DeviceFilter name="Leerfilter" active="true" remote="0"/> + </DeviceFilters> </USB> <Network> <Adapter slot="0" enabled="true" MACAddress="${macaddr}" cable="true" speed="0" type="${vb_network_card}"> diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include index ddf42f7c..f35bc9d8 100755 --- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include +++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include @@ -427,7 +427,7 @@ done # set the variables appropriately (several interfaces with different names) VIRTCMD=$(which VirtualBox 2>/dev/null) -VIRTCMDOPTS="--startvm ${machineuuid} --start-running" +VIRTCMDOPTS="--startvm ${machineuuid} --start-running --fullscreen" # set headless mode (-v off to disable vrdp) VIRTCMDHL=$(which VBoxHeadless 2>/dev/null) diff --git a/remote/modules/vbox/module.conf b/remote/modules/vbox/module.conf index 6d79a1e7..fde16503 100644 --- a/remote/modules/vbox/module.conf +++ b/remote/modules/vbox/module.conf @@ -1,7 +1,7 @@ -REQUIRED_VBOX_VERSION_MAJOR="4.3" -REQUIRED_VBOX_VERSION_MINOR="26" +REQUIRED_VBOX_VERSION_MAJOR="5.0" +REQUIRED_VBOX_VERSION_MINOR="0" REQUIRED_VBOX_VERSION="$REQUIRED_VBOX_VERSION_MAJOR.$REQUIRED_VBOX_VERSION_MINOR" -REQUIRED_VBOX_VERSIONCODE="98988" +REQUIRED_VBOX_VERSIONCODE="101573" REQUIRED_DIRECTORIES=" /etc diff --git a/remote/modules/vbox/module.conf.ubuntu.14 b/remote/modules/vbox/module.conf.ubuntu.14 index 59ed5ca7..ddb75af1 100644 --- a/remote/modules/vbox/module.conf.ubuntu.14 +++ b/remote/modules/vbox/module.conf.ubuntu.14 @@ -1,5 +1,4 @@ -REQUIRED_VBOX_OSCODE='Ubuntu~raring' # raring: 13.04, but also used here. Has not be changed when - # version for 14.04 appeared on virtualbox.org. +REQUIRED_VBOX_OSCODE='Ubuntu~trusty' REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb" REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack" |