From afae631cd8a442d3da51239f75cc5b22935bdf54 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 27 Apr 2016 17:14:59 +0200
Subject: [vmware] Disable free disk space checks

---
 .../vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc    | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index 7238ddaf..878e9a9d 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -149,6 +149,9 @@ fi
 # TODO: Need a way to check if supported by hardware before enabling!
 #grep -qi '^vpmc\.enable' "${TMPCONFIG}" || echo 'vpmc.enable = "TRUE"' >> "${TMPCONFIG}"
 
+# Disable space check warnings
+sed -i '/^mainMem.freeSpaceCheck/d' "${TMPCONFIG}"
+echo 'mainMem.freeSpaceCheck = "FALSE"' >> "${TMPCONFIG}"
 
 # At last_ Let's copy it to $confdir/run-vmware.conf
 cp -p "${TMPCONFIG}" "$conffile" && writelog "Copied TMPDIR/IMGUUID ${TMPCONFIG} to conffile ${conffile}" || \
-- 
cgit v1.2.3-55-g7522


From dba9eb00b9957d5ae2e63ec5f7a9534d29a81ae8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 27 Apr 2016 17:16:00 +0200
Subject: [hardware-stats] Count sessions as active when switched to another
 tty

---
 .../hardware-stats/data/opt/openslx/scripts/cron-system_usage_update    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update b/remote/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update
index 232e5eab..9ab77f4f 100755
--- a/remote/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update
+++ b/remote/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update
@@ -14,7 +14,7 @@ USED=0
 for SESSION in $(loginctl | awk '{print $1}'); do
 	unset Display Remote State
 	eval $(loginctl -p Display -p Remote -p State -p Class show-session "$SESSION")
-	if [ -n "$Display" ] && [ "$Remote" = "no" ] && [ "$State" = "active" ] && [ "$Class" = "user" ]; then
+	if [ -n "$Display" ] && [ "$Remote" = "no" ] && [ "$State" = "active" -o "$State" = "online" ] && [ "$Class" = "user" ]; then
 		USED=1
 		break;
 	fi
-- 
cgit v1.2.3-55-g7522