summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xremote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exebin12800 -> 12800 bytes
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include10
-rw-r--r--server/blacklists/essential/linux-base6
-rw-r--r--server/blacklists/essential/linux-extended2
4 files changed, 18 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
--- a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
Binary files differ
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"
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/**