[vbox] Changed dev access rights, some more modifications, gui/suppress mouse integration etc.

5 files changed, 33 insertions, 11 deletions

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 83336a20..a5a298ee 100755
--- a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
+++ b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
@@ -34,8 +34,13 @@ done
 
 # Should be done by udev rule - no mknod needed.
 # mknod -m 0660 /dev/vboxdrv c 10 59
-# chown root:vboxusers /dev/vboxdrv
 
+chown root:vboxusers /dev/vboxdrv
+chmod 666 /dev/vboxdrv
+chown root:vboxusers /dev/vboxdrvu
+chmod 666 /dev/vboxdrvu
+chown root:vboxusers /dev/vboxusb
+chmod 755 /dev/vboxusb
 
 # pretty dumb you can just create host-only interfaces, but not assign a specific
 # name/number
diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include
index 36c8ab80..62143c54 100644
--- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include
+++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include
@@ -23,7 +23,7 @@ cat << EOF > "${confdir}/VirtualBox.xml"
       <ExtraDataItem name="GUI/MaxGuestResolution" value="any"/> <!-- auto, width,height -->
       <ExtraDataItem name="GUI/UpdateCheckCount" value="2"/>
       <ExtraDataItem name="GUI/UpdateDate" value="never"/>
-      <ExtraDataItem name="GUI/SuppressMessages" value=",remindAboutAutoCapture,confirmInputCapture,remindAboutWrongColorDepth,confirmGoingFullscreen,remindAboutMouseIntegrationOn,remindAboutMouseIntegrationOff,showRuntimeError.warning.DevATA_DISKFULL,remindAboutPausedVMInput,confirmVMReset,showRuntimeError.warning.HostAudioNotResponding,showRuntimeError.warning.ExtPackNoEhci"/>
+      <ExtraDataItem name="GUI/SuppressMessages" value=",remindAboutAutoCapture,confirmInputCapture,remindAboutWrongColorDepth,confirmGoingFullscreen,remindAboutMouseIntegrationOn,remindAboutMouseIntegrationOff,showRuntimeError.warning.DevATA_DISKFULL,remindAboutPausedVMInput,confirmVMReset,showRuntimeError.warning.HostAudioNotResponding,showRuntimeError.warning.ExtPackNoEhci,remindAboutMouseIntegration"/>
       <ExtraDataItem name="GUI/TrayIcon/Enabled" value="false"/>
     </ExtraData>
     <MachineRegistry>
diff --git a/remote/modules/vbox/module.build b/remote/modules/vbox/module.build
index 608d7704..a42decb1 100644
--- a/remote/modules/vbox/module.build
+++ b/remote/modules/vbox/module.build
@@ -16,18 +16,23 @@ patch_vbox_scripts() {
 		sed -i "-i.original" "/^PATH=/c ${SCRIPTPATH}:/opt/openslx/bin:/opt/openslx/sbin"\
 		       	"${MODULE_BUILD_DIR}/usr/bin/$i"						# append openslx paths
 	done
+
+	# due to problems with group membership of kdm-spawned processes we need to
+	# patch ${MODULE_BUILD_DIR}/usr/share/virtualbox/VBoxCreateUSBNode.sh:
+	sed -i "s/0750/0755/g" "${MODULE_BUILD_DIR}/usr/share/virtualbox/VBoxCreateUSBNode.sh"
+	sed -i "s/0660/0666/g" "${MODULE_BUILD_DIR}/usr/share/virtualbox/VBoxCreateUSBNode.sh"
 }
 
 extract_extpack() {
 	pinfo "Unpacking Extension Pack ..."
-	mkdir -p ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
-	cp    ${MODULE_DIR}/src/vbox/extpack/[EP][xX][tE]* ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
+	mkdir -p "${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack"
+	cp    "${MODULE_DIR}"/src/vbox/extpack/[EP][xX][tE]* "${MODULE_BUILD_DIR}"/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
 	if [ x${AMD64_X86} == "xamd64" ]; then
 		pinfo "Unpacking 64bit branch of Extension Pack ..."
-		cp -r ${MODULE_DIR}/src/vbox/extpack/linux.amd64 ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
+		cp -r "${MODULE_DIR}/src/vbox/extpack/linux.amd64" "${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack"
 	else	# then we assume 32bit x86...
 		pinfo "Unpacking32bit branch of Extension Pack ..."
-		cp -r ${MODULE_DIR}/src/vbox/extpack/linux.x86 ${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack
+		cp -r "${MODULE_DIR}/src/vbox/extpack/linux.x86" "${MODULE_BUILD_DIR}/usr/lib/virtualbox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack"
 	fi
 }
 
diff --git a/remote/modules/vbox/module.conf b/remote/modules/vbox/module.conf
index fde16503..c172669a 100644
--- a/remote/modules/vbox/module.conf
+++ b/remote/modules/vbox/module.conf
@@ -1,12 +1,20 @@
-REQUIRED_VBOX_VERSION_MAJOR="5.0"
-REQUIRED_VBOX_VERSION_MINOR="0"
+# VBox version 5 branch:
+# REQUIRED_VBOX_VERSION_MAJOR="5.0"
+# REQUIRED_VBOX_VERSION_MINOR="0"
+# REQUIRED_VBOX_VERSIONCODE="101573"
+
+# VBox version 4 last branch:
+REQUIRED_VBOX_VERSION_MAJOR="4.3"
+REQUIRED_VBOX_VERSION_MINOR="26"
+REQUIRED_VBOX_VERSIONCODE="98988"
+
 REQUIRED_VBOX_VERSION="$REQUIRED_VBOX_VERSION_MAJOR.$REQUIRED_VBOX_VERSION_MINOR"
-REQUIRED_VBOX_VERSIONCODE="101573"
 
 REQUIRED_DIRECTORIES="
 				/etc
 				/lib
 				/usr
 "
-# REQUIRED_LDD_BLACKLIST: Keep in minde the leading '\|'!
+# REQUIRED_LDD_BLACKLIST: Keep in mind the leading '\|'!
 REQUIRED_LDD_BLACKLIST="\|VBoxVMM"
+
diff --git a/remote/modules/vbox/module.conf.ubuntu.14 b/remote/modules/vbox/module.conf.ubuntu.14
index ddb75af1..5ec7cc83 100644
--- a/remote/modules/vbox/module.conf.ubuntu.14
+++ b/remote/modules/vbox/module.conf.ubuntu.14
@@ -1,4 +1,8 @@
-REQUIRED_VBOX_OSCODE='Ubuntu~trusty'
+# VBox version 5 branch:
+# REQUIRED_VBOX_OSCODE='Ubuntu~trusty'
+
+# VBox version 4 last branch:
+REQUIRED_VBOX_OSCODE='Ubuntu~raring'
 
 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"