Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

8 files changed, 31 insertions, 31 deletions

diff --git a/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
index eee38a7b..94c2094f 100755
--- a/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
+++ b/remote/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
@@ -40,7 +40,7 @@ fi
 MAC=${BOOTIF:3}
 
 # 2) Get machine UUID, with fallback to MAC address if it fails for some reason
-UUID=$(dmidecode -s system-uuid)
+UUID=$(dmidecode -s system-uuid | head -n 1)
 if [ "${#UUID}" -ne "36" ]; then
 	echo "Determined UUID (${UUID}) has not expected length of 36, falling back to MAC..."
 	UUID="000000000000000-$BOOTIF"
@@ -143,7 +143,7 @@ fi
 
 # A) Read system model and manufacturer
 dmidec() {
-	local LMODEL=$(dmidecode "$@" 2>/dev/null | sed 's/\s\s*/ /g;s/^ //;s/ $//')
+	local LMODEL=$(dmidecode "$@" 2>/dev/null | grep -v '^Invalid' | sed 's/\s\s*/ /g;s/^ //;s/ $//')
 	case "$LMODEL" in
 		""|*"Product Name"*|*"be filled"*|"unknown"|*"product name"*)
 			LMODEL="Unknown"
diff --git a/remote/modules/kdm-theme-bwlp/data/etc/systemd/system/kdm-hwinfo-warnings.service b/remote/modules/kdm-theme-bwlp/data/etc/systemd/system/kdm-hwinfo-warnings.service
index b8139a97..39f101c8 100644
--- a/remote/modules/kdm-theme-bwlp/data/etc/systemd/system/kdm-hwinfo-warnings.service
+++ b/remote/modules/kdm-theme-bwlp/data/etc/systemd/system/kdm-hwinfo-warnings.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Patch warnings into KDM theme
-After=hardware-stats.service
+After=hardware-stats.service mount-vm-store.service
 Before=kdm.service
 
 [Service]
diff --git a/remote/modules/kdm-theme-bwlp/data/opt/openslx/scripts/systemd-kdm_hwinfo_warnings b/remote/modules/kdm-theme-bwlp/data/opt/openslx/scripts/systemd-kdm_hwinfo_warnings
index b542fabb..8b37de80 100755
--- a/remote/modules/kdm-theme-bwlp/data/opt/openslx/scripts/systemd-kdm_hwinfo_warnings
+++ b/remote/modules/kdm-theme-bwlp/data/opt/openslx/scripts/systemd-kdm_hwinfo_warnings
@@ -45,7 +45,7 @@ build_replacement_xml() {
 		add_replace_xml "000000" "* Die ID44-Partition ist sehr klein. VM-Sitzungen könnten nach einiger Zeit aus Speichermangel abstürzen."
 		CONTACT_RZ=fjeden
 	fi
-	if ! awk '{print $2}' /proc/mounts | grep -q '^/mnt/vmstore$'; then
+	if ! systemctl status mount-vm-store >/dev/null; then
 		add_replace_xml "ff0000" "* Der VM-Store konnte nicht eingehängt werden. VMs können nicht gestartet werden."
 		add_replace_xml "ff0000" "  Versuchen Sie das Problem zu lösen, indem Sie den Computer neu starten."
 	fi
diff --git a/remote/modules/kernel-vanilla/module.conf b/remote/modules/kernel-vanilla/module.conf
index 9d057125..fe822b91 100644
--- a/remote/modules/kernel-vanilla/module.conf
+++ b/remote/modules/kernel-vanilla/module.conf
@@ -1,5 +1,5 @@
 REQUIRED_BINARIES=""
 REQUIRED_LIBRARIES=""
 REQUIRED_DIRECTORIES=""
-REQUIRED_KERNEL="4.4.10"
+REQUIRED_KERNEL="4.4.12"
 REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
index e6e5771e..8b98311a 100755
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
diff --git a/remote/modules/run-virt/winres/winres.c b/remote/modules/run-virt/winres/winres.c
index acc15e93..1c5650b8 100644
--- a/remote/modules/run-virt/winres/winres.c
+++ b/remote/modules/run-virt/winres/winres.c
@@ -495,11 +495,11 @@ static void readShareFile()
 	char *skey1 = NULL, *skey2 = NULL;
 	if (fgets(creds, sizeof(creds), h) != NULL) {
 		char *ptr = creds;
-		shost = getToken(&ptr, FALSE);
-		sport = getToken(&ptr, FALSE);
+		shost = getToken(&ptr, TRUE);
+		sport = getToken(&ptr, TRUE);
 		skey1 = getToken(&ptr, FALSE);
 		skey2 = getToken(&ptr, FALSE);
-		suser = getToken(&ptr, FALSE);
+		suser = getToken(&ptr, TRUE);
 	}
 	int idx = 0;
 	while (fgets(buffer, sizeof(buffer), h) != NULL && idx < DRIVEMAX) {
@@ -531,8 +531,6 @@ drive_fail:
 		return;
 	if (atoi(sport) < 1000 || atoi(sport) > 65535) // Invalid port
 		return;
-	shost = strdup(shost);
-	sport = strdup(sport);
 	bkey1 = hex2bin(skey1);
 	bkey2 = hex2bin(skey2);
 	if (bkey1 == NULL || bkey2 == NULL)
@@ -627,11 +625,11 @@ static DWORD mount(LPNETRESOURCEW share, LPWSTR pass, LPWSTR user)
 		}
 		if (retval != ERROR_INVALID_PASSWORD && retval != ERROR_LOGON_FAILURE
 				&& retval != ERROR_BAD_USERNAME && retval != ERROR_ACCESS_DENIED
-				&& retval != ERROR_SESSION_CREDENTIAL_CONFLICT) {
+				&& retval != ERROR_SESSION_CREDENTIAL_CONFLICT && retval != ERROR_BAD_NET_NAME) {
 			return retval;
 		}
 	}
-	static wchar_t nuser[BUFLEN] = L"", npass[BUFLEN] = L"";
+	static wchar_t nuser[BUFLEN] = L"\0", npass[BUFLEN] = L"\0";
 	if (nuser[0] == 0 && npass[0] == 0) {
 		BOOL ok = TRUE;
 		if (suser != NULL) {
@@ -691,7 +689,7 @@ static BOOL mountNetworkShare(const netdrive_t *d)
 		return TRUE;
 	}
 	DWORD retval;
-	NETRESOURCEW share;
+	NETRESOURCEW share = { 0 };
 	share.dwType = RESOURCETYPE_DISK;
 	share.lpLocalName = letter;
 	share.lpRemoteName = path;
diff --git a/remote/rootfs/rootfs-stage32/module.conf.ubuntu b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
index 30feca85..7fd3a401 100644
--- a/remote/rootfs/rootfs-stage32/module.conf.ubuntu
+++ b/remote/rootfs/rootfs-stage32/module.conf.ubuntu
@@ -6,7 +6,7 @@ REQUIRED_INSTALLED_PACKAGES="
 			curl
 			openssl
 "
-REQUIRED_SYSTEM_DIRECTORIES+="
+REQUIRED_SYSTEM_FILES+="
 			/lib/xtables
 "
 REQUIRED_FILES+="
diff --git a/server/modules/pvs2-freiburg/opt/openslx/pvs2/pvs2.ini b/server/modules/pvs2-freiburg/opt/openslx/pvs2/pvs2.ini
index ff35dabf..9c59bc58 100644
--- a/server/modules/pvs2-freiburg/opt/openslx/pvs2/pvs2.ini
+++ b/server/modules/pvs2-freiburg/opt/openslx/pvs2/pvs2.ini
@@ -4,13 +4,13 @@ rooms=-100,-101,-113,-114
 [-100]
 mgrIP=132.230.4.32
 client/size=16
-client/1/ip=132.230.4.156
+client/1/ip=132.230.4.172
 client/1/pos=@Point(1 6)
-client/2/ip=132.230.4.157
+client/2/ip=132.230.4.173
 client/2/pos=@Point(0 4)
-client/3/ip=132.230.4.158
+client/3/ip=132.230.4.174
 client/3/pos=@Point(1 4)
-client/4/ip=132.230.4.159
+client/4/ip=132.230.4.175
 client/4/pos=@Point(3 4)
 client/5/ip=132.230.4.160
 client/5/pos=@Point(4 4)
@@ -111,30 +111,32 @@ client/16/pos=@Point(0 3)
 
 [-114]
 mgrIP=132.230.4.33
+clientSize=@Size(2 2)
+# backgroundImage=/opt/openslx/vmchooser/themes/bwlehrpool/bwlehrpool-right.png
 client/size=13
 client/1/ip=132.230.4.100
-client/1/pos=@Point(3 5)
+client/1/pos=@Point(7 13)
 client/2/ip=132.230.4.101
-client/2/pos=@Point(5 3)
+client/2/pos=@Point(10 10)
 client/3/ip=132.230.4.102
-client/3/pos=@Point(6 3)
+client/3/pos=@Point(13 8)
 client/4/ip=132.230.4.103
-client/4/pos=@Point(5 4)
+client/4/pos=@Point(13 11)
 client/5/ip=132.230.4.104
-client/5/pos=@Point(5 0)
+client/5/pos=@Point(13 2)
 client/6/ip=132.230.4.105
-client/6/pos=@Point(1 3)
+client/6/pos=@Point(4 10)
 client/7/ip=132.230.4.106
-client/7/pos=@Point(5 1)
+client/7/pos=@Point(11 4)
 client/8/ip=132.230.4.107
-client/8/pos=@Point(1 1)
+client/8/pos=@Point(1 4)
 client/9/ip=132.230.4.108
-client/9/pos=@Point(0 0)
+client/9/pos=@Point(1 1)
 client/10/ip=132.230.4.109
-client/10/pos=@Point(6 0)
+client/10/pos=@Point(10 1)
 client/11/ip=132.230.4.110
-client/11/pos=@Point(0 3)
+client/11/pos=@Point(1 8)
 client/12/ip=132.230.4.111
-client/12/pos=@Point(1 4)
+client/12/pos=@Point(1 11)
 client/13/ip=132.230.4.112
-client/13/pos=@Point(1 0)
+client/13/pos=@Point(4 3)