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

8 files changed, 69 insertions, 3 deletions

diff --git a/remote/modules/openbox/data/etc/xdg/openbox/menu.xml b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml
new file mode 100644
index 00000000..866969f6
--- /dev/null
+++ b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<openbox_menu xmlns="http://openbox.org/"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://openbox.org/
+                file:///usr/share/openbox/menu.xsd">
+
+<menu id="root-menu" label="Openbox 3">
+  <item label="Terminal">
+    <action name="Execute"><execute>xterm</execute></action>
+  </item>
+  <item label="VM Chooser">
+    <action name="Execute"><execute>vmchooser -c /etc/openslx/vmchooser/vmchooser.conf</execute></action>
+  </item>
+  <!-- This requires the presence of the 'menu' package to work -->
+  <menu id="/Debian" />
+  <separator />
+  <menu id="client-list-menu" />
+  <separator />
+  <item label="Restart">
+    <action name="Restart" />
+  </item>
+  <separator />
+  <item label="Exit">
+    <action name="Exit" />
+  </item>
+</menu>
+
+</openbox_menu>
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build
new file mode 100644
index 00000000..3e56fbfb
--- /dev/null
+++ b/remote/modules/openbox/openbox.build
@@ -0,0 +1,18 @@
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+	return 0
+}
+
+post_copy() {
+	[ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango"
+	pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules"
+}
diff --git a/remote/modules/openbox/openbox.conf b/remote/modules/openbox/openbox.conf
new file mode 100644
index 00000000..67c63c4c
--- /dev/null
+++ b/remote/modules/openbox/openbox.conf
@@ -0,0 +1,12 @@
+REQUIRED_DEPENDENCIES=" openbox
+			libpango1.0-0"
+REQUIRED_PACKAGES="	openbox
+			libpango1.0-0"
+REQUIRED_BINARIES="	openbox
+			openbox-session"
+REQUIRED_FILES="	/usr/share/xsessions/openbox.desktop"	
+REQUIRED_DIRECTORIES="	/etc
+			/usr/lib/openbox
+			/usr/share/themes/Clearlooks
+			/usr/lib/$ARCH_TRIPLET/pango/"
+			
diff --git a/remote/modules/pam/data/etc/skel/README b/remote/modules/pam/data/etc/skel/README
new file mode 100644
index 00000000..9c558e35
--- /dev/null
+++ b/remote/modules/pam/data/etc/skel/README
@@ -0,0 +1 @@
+.
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
index 65db53da..bc93d68b 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
@@ -421,7 +421,7 @@ esac
 
 # check if ide/scsi and hwver of image
 # read only the first 30 lines to be shure
-imghead=$(head -30 ${diskfile})
+imghead=$(head -n 30 ${diskfile})
 hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" |\
   awk -F '"' '{print $2}')
 hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" |\
diff --git a/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service
new file mode 120000
index 00000000..7deb4820
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service
@@ -0,0 +1 @@
+../vmware.service
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
index 067b15a0..df5331e0 100644
--- a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
+++ b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Sets up the vmware environment
 Wants=graphical.target
+Before=graphical.target
 
 [Service]
 Type=simple
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index 1e3090ac..21d28dec 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -1,7 +1,9 @@
 fetch_source() {
 	#mount vmware bundle directory
 	[ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware
-	mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting."
+	if [ "x$(ls /mnt/store/vmware)" == "x" ]; then
+		mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting."
+	fi
 	ARCH=$(uname -m)
 	[ "$ARCH" = "i686" ] && ARCH=i386
 	local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)"
@@ -29,6 +31,8 @@ build() {
 	cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx."
 	[ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; }
 	chmod +x "$TARGET"/bin/*
+	chmod +x "$MODULE_BUILD_DIR"/usr/{bin,sbin}/*
+	chmod +x "$TARGET"/lib/*.sh
 	pinfo "Patching LIBCONF_DIR"
 	local file=""
 	for file in $(grep -rl "@@LIBCONF_DIR@@" "$MODULE_BUILD_DIR"); do
@@ -49,7 +53,7 @@ build() {
 
 post_copy() {
 	# FIXME: gconftool is copied without dependencies
-	#tarcopy "$(find /usr/lib/ -name gconv -type d)" "$TARGET_BUILD_DIR"
+	tarcopy "$(find /usr/lib/ -name gconv -type d)" "$TARGET_BUILD_DIR"
 	:
 }