From 2817e5c800cb80dc0817a20fb167425b4a2f9fb2 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 6 Sep 2013 16:40:35 +0200 Subject: [vbox] two unneeded files deleted --- remote/modules/vbox/data/opt/openslx/bin/vmplayer | 15 --------------- remote/modules/vbox/data/opt/openslx/bin/vmware | 11 ----------- 2 files changed, 26 deletions(-) delete mode 100755 remote/modules/vbox/data/opt/openslx/bin/vmplayer delete mode 100755 remote/modules/vbox/data/opt/openslx/bin/vmware diff --git a/remote/modules/vbox/data/opt/openslx/bin/vmplayer b/remote/modules/vbox/data/opt/openslx/bin/vmplayer deleted file mode 100755 index 147f514f..00000000 --- a/remote/modules/vbox/data/opt/openslx/bin/vmplayer +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# radically simplified version of the original script vmplayer by VMware Inc. -PREFIX=/usr/lib/vmware # depends on the vmware location - -# HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled -export force_s3tc_enable=true - -exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ - "$PREFIX"'/lib' \ - "$PREFIX"'/bin/vmplayer' \ - "$PREFIX"'/libconf' "$@" - - - - diff --git a/remote/modules/vbox/data/opt/openslx/bin/vmware b/remote/modules/vbox/data/opt/openslx/bin/vmware deleted file mode 100755 index 1fe9b11d..00000000 --- a/remote/modules/vbox/data/opt/openslx/bin/vmware +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# radically simplified version of the original script vmplayer by VMware Inc. -PREFIX=/usr/lib/vmware # depends on the vmware location -exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ - "$PREFIX"'/lib' \ - "$PREFIX"'/bin/vmware' \ - "$PREFIX"'/libconf' "$@" - - - - -- cgit v1.2.3-55-g7522 From 907a1c9ebf3d374ebc2930d009d7376ab92c8c3d Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 9 Sep 2013 14:42:55 +0200 Subject: [debug] Added logger to opensuse conf --- remote/modules/debug/debug.conf.opensuse | 1 + 1 file changed, 1 insertion(+) 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 " -- cgit v1.2.3-55-g7522 From df0b2e2d7d1efdfc6b35c790522d0d876c6faf88 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 9 Sep 2013 15:23:11 +0200 Subject: [vbox] Full udev rule with ENV{DEVTYPE}=="usb_device", see README! --- remote/modules/vbox/data/etc/udev/rules.d/10-vboxdrv.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.3-55-g7522 From ce621f1e8d9e7b4c4ccb1d3f8fe615175731821d Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 9 Sep 2013 15:28:46 +0200 Subject: [vbox] Amended README-File: Cave: systemd-udevd restart. --- remote/modules/vbox/README | 9 +++++++++ 1 file changed, 9 insertions(+) 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. -- cgit v1.2.3-55-g7522 From 9c15093466d1835e90be251060267de2b3c3b3b1 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Mon, 9 Sep 2013 15:30:45 +0200 Subject: [vbox] addon-init: systemd-udevd gets restarted now. Cave: Queued message loss possible. --- remote/modules/vbox/data/addon-init | 4 ++++ 1 file changed, 4 insertions(+) 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 -- cgit v1.2.3-55-g7522 From ea4bfa3418cf9d1ff380e5531de22d223c4e291b Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 9 Sep 2013 18:59:48 +0200 Subject: [branding-freiburg] New config module: Add UniFR logo in /etc/, for now used by kdm theme --- server/configs/freiburg/branding-freiburg | 1 + server/modules/branding-freiburg/etc/branding.svg | 1277 +++++++++++++++++++++ 2 files changed, 1278 insertions(+) create mode 120000 server/configs/freiburg/branding-freiburg create mode 100644 server/modules/branding-freiburg/etc/branding.svg diff --git a/server/configs/freiburg/branding-freiburg b/server/configs/freiburg/branding-freiburg new file mode 120000 index 00000000..174dca3e --- /dev/null +++ b/server/configs/freiburg/branding-freiburg @@ -0,0 +1 @@ +../../modules/branding-freiburg \ No newline at end of file diff --git a/server/modules/branding-freiburg/etc/branding.svg b/server/modules/branding-freiburg/etc/branding.svg new file mode 100644 index 00000000..fbefc54a --- /dev/null +++ b/server/modules/branding-freiburg/etc/branding.svg @@ -0,0 +1,1277 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g7522