[vmchooser] moved all vmchooser specific files and scripts to /opt/openslx. Renamed 'var/lib/virt' to 'mnt/vmstore'. Added bwlehrpool theme for vmchooser#

32 files changed, 44 insertions, 39 deletions

diff --git a/mltk b/mltk
index ee965f49..24de8d33 100755
--- a/mltk
+++ b/mltk
@@ -264,7 +264,7 @@ run() {
 		[[ $SERVER_SYNC == 1 ]] && sync_remote
 	        [[ $SERVER_CLEAN == 1 ]] && clean_target $TARGET
 	        [[ $SERVER_EXPORT == 1 ]] && export_target $TARGET $SERVER_EXPORT_TYPE
-		[[ $SERVER_CONFIG == 1 ]] && echo "LASFKHSL" && generate_config $SERVER_CONFIG_TYPE
+		[[ $SERVER_CONFIG == 1 ]] && generate_config $SERVER_CONFIG_TYPE
 	fi
 }
 
diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
deleted file mode 100644
index 3dd30ebc..00000000
--- a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-pool=default
-theme=unifr
-pvs=0
-path=/var/lib/virt
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service b/remote/modules/vmchooser/data/etc/systemd/system/mount-vm-store.service
index cfaa7af8..cfaa7af8 100644
--- a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service
+++ b/remote/modules/vmchooser/data/etc/systemd/system/mount-vm-store.service
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/network.target.wants/mount-vm-store.service b/remote/modules/vmchooser/data/etc/systemd/system/network.target.wants/mount-vm-store.service
new file mode 120000
index 00000000..d6a88c27
--- /dev/null
+++ b/remote/modules/vmchooser/data/etc/systemd/system/network.target.wants/mount-vm-store.service
@@ -0,0 +1 @@
+../mount-vm-store.service
\ No newline at end of file
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/network.target.wants/var-lib-virt.service b/remote/modules/vmchooser/data/etc/systemd/system/network.target.wants/var-lib-virt.service
deleted file mode 120000
index f51adef6..00000000
--- a/remote/modules/vmchooser/data/etc/systemd/system/network.target.wants/var-lib-virt.service
+++ /dev/null
@@ -1 +0,0 @@
-../var-lib-virt.service
\ No newline at end of file
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/vmchooser.service b/remote/modules/vmchooser/data/etc/systemd/system/vmchooser.service
index 001d90f3..1a5a980a 100644
--- a/remote/modules/vmchooser/data/etc/systemd/system/vmchooser.service
+++ b/remote/modules/vmchooser/data/etc/systemd/system/vmchooser.service
@@ -6,4 +6,4 @@ Before=graphical.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/etc/openslx/vmchooser/vmchooser-env
+ExecStart=/opt/openslx/scripts/systemd-vmchooser_env
diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/smb.conf b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf
index ec757ce4..ec757ce4 100644
--- a/remote/modules/vmchooser/data/etc/openslx/vmchooser/smb.conf
+++ b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/smb.conf
diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf
new file mode 100644
index 00000000..92578ead
--- /dev/null
+++ b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/vmchooser.conf
@@ -0,0 +1,4 @@
+pool=default
+theme=openslx
+pvs=0
+path=/mnt/vmstore
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
index 27a8f55c..75af39fe 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
@@ -2,7 +2,5 @@
 
 . /opt/openslx/config || exit 1
 
-export PATH="$PATH:/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/usr/sbin"
-
-mkdir -p /var/lib/virt
-mount -t nfs -o ro,async,nolock,vers=3 "$SLX_VM_NFS" /var/lib/virt
+mkdir -p /mnt/vmstore
+mount -t nfs -o ro,async,nolock,vers=3 "$SLX_VM_NFS" /mnt/vmstore
diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
index e2a3e063..50eace20 100755
--- a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
@@ -11,7 +11,7 @@ hwinfo --cdrom | grep -i "Device File:" | awk {'print $3'} >/etc/openslx/hwinfo.
 hwinfo --floppy | grep -i "Device File:" | awk {'print $3'} >/etc/openslx/hwinfo.floppy 
 
 #from plugins/vmchooser/XX_vmchooser.sh
-VMCHOOSER_CONF_DIR=/etc/openslx/vmchooser
+VMCHOOSER_CONF_DIR=/opt/openslx/etc/vmchooser
 
 mkdir -p ${VMCHOOSER_CONF_DIR}/loopimg
 mkdir -p ${VMCHOOSER_CONF_DIR}/fd-loop -m 1777
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/run-virt.sh b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 473dfbc7..874669dd 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/run-virt.sh
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -22,14 +22,12 @@
 ### Define default dirs / get configs
 ################################################################################
 
-PLUGINCONFROOT=/etc/opt/openslx/plugins
-PLUGINCONFDIR=/etc/opt/openslx/plugins/vmchooser
 # include general configuration from vmchooser
-[ -f /etc/openslx/vmchooser/vmchooser.conf ] && \
-. /etc/openslx/vmchooser/vmchooser.conf
+[ -f /opt/openslx/etc/vmchooser/vmchooser.conf ] && \
+. /opt/openslx/etc/vmchooser/vmchooser.conf
 # load general virtualization information
-[ -f /etc/openslx/vmchooser/virtualization.conf ] && \
-. /etc/openslx/vmchooser/virtualization.conf
+[ -f /opt/openslx/etc/vmchooser/virtualization.conf ] && \
+. /opt/openslx/etc/vmchooser/virtualization.conf
 
 ################################################################################
 ### Functions used throughout the script
@@ -356,7 +354,7 @@ fdtest=${floppy_0:+"TRUE"}
 # if $fdtest not set floppy0="FALSE", else "TRUE"
 floppy0=${fdtest:-"FALSE"}
 floppy1="TRUE"
-floppy1name="/etc/openslx/vmchooser/loopimg/fd.img"
+floppy1name="/opt/openslx/etc/vmchooser/loopimg/fd.img"
 # if $cdrom_0 from run-virt.include set then cdtest="TRUE"
 cdtest=
 cdtest=${cdrom_0:+"TRUE"}
@@ -415,14 +413,14 @@ fi
 
 # Copy guest configuration (with added information) config.xml to be accessed
 # via virtual floppy
-cp "$xmlfile" "/etc/openslx/vmchooser/fd-loop/config.xml"
+cp "$xmlfile" "/opt/openslx/etc/vmchooser/fd-loop/config.xml"
 # Add another file with resolution information
-xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -n 1 > "/etc/openslx/vmchooser/fd-loop/hostres.txt"
+xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -n 1 > "/opt/openslx/etc/vmchooser/fd-loop/hostres.txt"
 
 # Get all virtual machine specific stuff from the respective include file
-if [ -e /etc/openslx/"${xmlvirt}"/run-virt.include ] ; then
+if [ -e /opt/openslx/etc/"${xmlvirt}"/run-virt.include ] ; then
 	self="${xmlvirt}"
-	. /etc/openslx/"${xmlvirt}"/run-virt.include
+	. /opt/openslx/etc/"${xmlvirt}"/run-virt.include
 	# start a windowmanager for easier handling
 	# (expect problems /w windows opening in background /w vmware without wm)
 	for dm in twm xfwm4 metacity openbox blackbox kwin fvwm2 ; do
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
index 67e49d3e..67e49d3e 100755
--- a/remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png
new file mode 100644
index 00000000..c9d8ab0d
--- /dev/null
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-left.png
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png
index 8ca9347b..8ca9347b 100644
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-right.png
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool-right.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini
new file mode 100644
index 00000000..90d00617
--- /dev/null
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/bwlehrpool/bwlehrpool.ini
@@ -0,0 +1,4 @@
+background-color=#ffffff
+image-right=bwlehrpool-right.png
+image-left=bwlehrpool-left.png
+
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-left.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png
index 900dd867..900dd867 100644
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx-left.png
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-left.png
diff --git a/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png
new file mode 100644
index 00000000..8ca9347b
--- /dev/null
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx-right.png
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx.ini b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini
index 57a22821..57a22821 100644
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/openslx/openslx.ini
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/openslx/openslx.ini
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-left.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png
index c8736b72..c8736b72 100644
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-left.png
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-left.png
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-right.png b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png
index e21f0d8b..e21f0d8b 100644
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets-right.png
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets-right.png
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets.ini b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini
index d9aa17f6..d9aa17f6 100644
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/planets/planets.ini
+++ b/remote/modules/vmchooser/data/opt/openslx/usr/share/vmchooser/themes/planets/planets.ini
diff --git a/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop b/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop
index d33615cf..66f97e68 100755
--- a/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop
+++ b/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop
@@ -4,7 +4,7 @@ Name=virtual machine chooser (default)
 Name[de]=Virtuelle Maschine auswählen
 Comment=This session starts the vm session chooser
 Comment[de]=Diese Sitzung startet das Auswahlmenü für die vorhandenen Sitzungen
-Exec=/opt/openslx/bin/vmchooser -c /etc/openslx/vmchooser/vmchooser.conf
+Exec=/opt/openslx/bin/vmchooser -c /opt/openslx/etc/vmchooser/vmchooser.conf
 TryExec=/opt/openslx/bin/vmchooser
 Icon=
 Type=Application
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_l.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_l.png
deleted file mode 100644
index e602ccd1..00000000
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_l.png
+++ /dev/null
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_r.png b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_r.png
deleted file mode 100644
index 3edbcb0c..00000000
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/title_r.png
+++ /dev/null
diff --git a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/unifr.ini b/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/unifr.ini
deleted file mode 100644
index dadcb4e1..00000000
--- a/remote/modules/vmchooser/data/usr/local/share/vmchooser/themes/unifr/unifr.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-background-color=#003592
-image-right=title_r.png
-image-left=title_l.png
-
diff --git a/remote/modules/vmchooser/data/var/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/var/opt/openslx/bin/run-virt.sh
deleted file mode 120000
index 5139cf8f..00000000
--- a/remote/modules/vmchooser/data/var/opt/openslx/bin/run-virt.sh
+++ /dev/null
@@ -1 +0,0 @@
-/opt/openslx/scripts/run-virt.sh
\ No newline at end of file
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build
index facd8c54..7d78f508 100644
--- a/remote/modules/vmchooser/vmchooser.build
+++ b/remote/modules/vmchooser/vmchooser.build
@@ -5,17 +5,27 @@ fetch_source() {
 }
 
 build() {
+	SRCDIR="${MODULE_DIR}/src/"
 
-SRCDIR="${MODULE_DIR}/src/"
+	[ ! -d "${MODULE_BUILD_DIR}/${PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${PREFIX}" 
+	cd "${MODULE_BUILD_DIR}/${PREFIX}"
 
-[ ! -d "${MODULE_BUILD_DIR}/${PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${PREFIX}" 
-cd "${MODULE_BUILD_DIR}/${PREFIX}"
+	# patch globals.cpp and globals.h to use standardised paths /opt/openslx/...
+	sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"/g' "${SRCDIR}"/src/globals.h
+	sed -i 's/^#define VMCHOOSER_ETC_BASE_PATH.*/#define VMCHOOSER_ETC_BASE_PATH "\/opt\/openslx\/etc\/vmchooser"/g' "${SRCDIR}"/src/globals.h
+	sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"\n#define VMCHOOSER_SCRIPTS_PATH "\/opt\/openslx\/scripts"/g' "${SRCDIR}"/src/globals.h
+	sed -i 's/^#define VMCHOOSER_THEME_BASE.*/#define VMCHOOSER_THEME_BASE "\/opt\/openslx\/usr\/share\/vmchooser\/themes"/g' "${SRCDIR}"/src/globals.h
 
-pinfo "Running make"
-cmake $CMAKE_ARGS $SRCDIR && make 
+	sed -i 's/^QString binPath(VMCHOOSER_BIN_PATH);/QString binPath(VMCHOOSER_BIN_PATH);\nQString scriptsPath(VMCHOOSER_SCRIPTS_PATH);/g' "${SRCDIR}"/src/globals.cpp
+	sed -i 's/^QString runVmScript(binPath + "\/run-virt.sh");/QString runVmScript(scriptsPath + "\/vmchooser-run_virt");/g' "${SRCDIR}"/src/globals.cpp
+	sed -i 's/^QString filterScript(binPath + "\/xmlfilter.sh");/QString filterScript(scriptsPath + "\/vmchooser-xml_filter");/g' "${SRCDIR}"/src/globals.cpp
+	sed -i 's/^#define VMCHOOSER_VMPATH.*/#define VMCHOOSER_VMPATH "\/mnt\/vmstore"/g' "${SRCDIR}"/src/globals.h
 
-cd - &> /dev/null
+	pinfo "Running cmake"
+	cmake $CMAKE_ARGS $SRCDIR || perror "'cmake $CMAKE_ARGS $SRCDIR' failed."
+	make || perror "'make' failed."
 
+	cd - &> /dev/null
 }
 
 post_copy() {	
diff --git a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
index 6bffb508..30bb42ff 100644
--- a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
+++ b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
@@ -6,4 +6,4 @@ After=vmchooser.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/etc/openslx/vmware/vmware-env start
+ExecStart=/opt/openslx/scripts/systemd-vmware_env start
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/nvram b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/nvram
index 85125f1e..85125f1e 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/nvram
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/nvram
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
index 71d294cb..675835a9 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
@@ -425,7 +425,7 @@ diskfile="${vmpath}"
 vmhome="${HOME}/.vmware"
 
 # get several version infos for vmware/player
-. /etc/openslx/vmware/vmware.conf
+. /opt/openslx/etc/vmware/vmware.conf
 vmbuild=$buildversion
 vmversion=$version
 
@@ -549,7 +549,7 @@ sync
 # own nvram. We need it for floppy drive b, default nvram has just drive a
 # TODO: optimize, currently kinda inefficient, too much copys, but we
 # don't know which one is installed...
-cp "/etc/openslx/vmware/nvram" "$confdir/nvram" 2>/dev/null
+cp "/opt/openslx/etc/vmware/nvram" "$confdir/nvram" 2>/dev/null
 
 
 # logging and stdout
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/vmware.conf
index 210b814f..210b814f 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/vmware.conf
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/opt/openslx/scripts/systemd-vmware_env
index feff5135..4103eae6 100755
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
+++ b/remote/modules/vmplayer/data/opt/openslx/scripts/systemd-vmware_env
@@ -12,7 +12,7 @@
 
 export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin
 
-VMWARE_CONF_DIR=/etc/openslx/vmware
+VMWARE_CONF_DIR=/opt/openslx/etc/vmware
 
 for wait in 1 1 2 2 3 end; do
 	grep '^SLX_DNS' /opt/openslx/config > /dev/null && break