diff options
| author | Christian Rößler | 2016-04-28 16:50:08 +0200 |
|---|---|---|
| committer | Christian Rößler | 2016-04-28 16:50:08 +0200 |
| commit | 462c821af828098dd0b010e0f5d45f34d8f3b57b (patch) | |
| tree | 4a949efab10de0251ed78890f1a4dd48cfe45b54 /remote | |
| parent | [run-virt] Linux-VMs fd1, some more fixes, Ubuntu 14.04 LTS (diff) | |
| parent | [hardware-stats] Count sessions as active when switched to another tty (diff) | |
| download | tm-scripts-462c821af828098dd0b010e0f5d45f34d8f3b57b.tar.gz tm-scripts-462c821af828098dd0b010e0f5d45f34d8f3b57b.tar.xz tm-scripts-462c821af828098dd0b010e0f5d45f34d8f3b57b.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update | 2 | ||||
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc | 3 |
2 files changed, 4 insertions, 1 deletions
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 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}" || \ |