From 7a722fae3f8da7d5c22f6121ec76b41a2c843b39 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 Jan 2014 15:44:30 +0100
Subject: [vmchooser] Update resolution tool

---
 .../data/opt/openslx/vmchooser/data/openslx.exe     | Bin 12800 -> 12800 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
index 13092874..8b320003 100755
Binary files a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe and b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe differ
-- 
cgit v1.2.3-55-g7522


From b5c885b0dfb4f1b67c1d4ea01792a9347d91817c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 Jan 2014 15:49:08 +0100
Subject: Refine stage 4 blacklist: No backups, no shadow- group- and passwd-

---
 server/blacklists/essential/linux-base     | 6 ++++++
 server/blacklists/essential/linux-extended | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base
index f83ef1ac..c8f7c343 100644
--- a/server/blacklists/essential/linux-base
+++ b/server/blacklists/essential/linux-base
@@ -40,3 +40,9 @@
 - /bin/sh
 # This is where the bind-mount of mltk resides...
 - /export/build
+- /etc/group-
+- /etc/gshadow
+- /etc/gshadow-
+- /etc/passwd-
+- /etc/shadow-
+
diff --git a/server/blacklists/essential/linux-extended b/server/blacklists/essential/linux-extended
index 3aed0dac..143caadb 100644
--- a/server/blacklists/essential/linux-extended
+++ b/server/blacklists/essential/linux-extended
@@ -20,4 +20,6 @@
 - /usr/local/sbin/busybox
 # MOTD updater (tty/ssh login) pretty annoying as it tells you about available updates on ubuntu etc.
 - /etc/update-motd.d/**
+# Backups don't make sense
+- /var/backups/**
 
-- 
cgit v1.2.3-55-g7522


From d54f34f6c02c101ed6ee7cb34ee918c748b1fb98 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Thu, 23 Jan 2014 16:00:26 +0100
Subject: [vmware] run-virt.include: +windows8, windows8-64. Values same as
 windows7(-64).

---
 .../vmware/data/opt/openslx/vmchooser/vmware/run-virt.include  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index ef29f495..3933287b 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -131,6 +131,16 @@ runvmwareconfheader ()
 			MAXMEM="8000"
 			MAXCORES="4"
 		;;
+		win8*64|windows8*64)
+			vmostype="windows8-64"
+			MAXMEM="32000"
+			MAXCORES="4"
+		;;
+		win8*|windows8*)
+			vmostype="windows8"
+			MAXMEM="8000"
+			MAXCORES="4"
+		;;
 		win*64)
 			MAXMEM="16000"
 			MAXCORES="4"
-- 
cgit v1.2.3-55-g7522