Merge branch 'master' of dnbd3:openslx-ng/tm-scripts

4 files changed, 16 insertions, 2 deletions

diff --git a/remote/modules/debug/debug.conf.opensuse b/remote/modules/debug/debug.conf.opensuse
index b7971956..e4306fc3 100644
--- a/remote/modules/debug/debug.conf.opensuse
+++ b/remote/modules/debug/debug.conf.opensuse
@@ -8,4 +8,5 @@ REQUIRED_INSTALLED_PACKAGES="
 "
 REQUIRED_BINARIES+="
 	fonts-config
+	logger
 "
diff --git a/remote/modules/vbox/README b/remote/modules/vbox/README
index 41e7d219..142bce5e 100644
--- a/remote/modules/vbox/README
+++ b/remote/modules/vbox/README
@@ -12,10 +12,19 @@ please note there is also a (linked) scripts named VBoxManage (note capitals).
 
 It is therefore recommended to use the lower case version (vboxmanage).
 
+
 systemd capabilites:
+
 The systemd-udevd compiled within the module systemd lacks a capability in
 the environment variable DEVTYPE at least in regard to USB devices, so an
 entry ENV{DEVTYPE}=="usb_device" in an udev rule file rule will not work.
+
 This applies to several versions, tested so far 195, 204, 206.
 In contrast to this a hand-copied distribution binary will work flawlessly
 within the openSLX biotope.
+
+It does not seem possible right now to circumvent this problem, as this kind
+of problem seems to be unknown  even irc/systemd development group. So as a
+workaround the systemd-udevd will be restarted in addon-init. But the danger
+of losing queue messages needs to be kept in mind, and if a solution arises,
+the udevd restart line should be deleted.
diff --git a/remote/modules/vbox/data/addon-init b/remote/modules/vbox/data/addon-init
index 0c77c3fc..d3c3fa47 100755
--- a/remote/modules/vbox/data/addon-init
+++ b/remote/modules/vbox/data/addon-init
@@ -11,3 +11,7 @@ fi
 
 systemctl daemon-reload
 systemctl start vbox.service
+
+# this seems to be necessary due to the misbehaviour of udevd
+# in view of the undetected ENV dev_type 
+systemctl restart systemd-udevd
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 a94f2165..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", 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{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{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"