Merge branch 'master' into installer

10 files changed, 44 insertions, 33 deletions

diff --git a/core/includes/system.inc b/core/includes/system.inc
index 8885eb65..d852310e 100644
--- a/core/includes/system.inc
+++ b/core/includes/system.inc
@@ -58,7 +58,7 @@ __init () {
 		# Enable distcc?
 		testfile="/tmp/test.$$.${RANDOM}.c"
 		echo "int main() { return 0; }" > "$testfile"
-		DISTCC_FALLBACK=0 distcc "gcc-${ver}" -o "${testfile}.bin" -c "$testfile"
+		DISTCC_FALLBACK=0 distcc "gcc-${ver}" -o "${testfile}.bin" -c "$testfile" &>/dev/null
 		ret=$?
 		if [ "$ret" = 0 ] && [ -f "${testfile}.bin" ]; then
 			if [[ "$CC$CXX" == */ccache* ]]; then
@@ -77,7 +77,7 @@ __init () {
 			fi
 			export MAKEFLAGS="-j40"
 		fi
-		rm -- "$testfile" "${testfile}.bin"
+		rm -f -- "$testfile" "${testfile}.bin"
 	fi
 }
 
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update b/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update
index 89df8e74..14e08e68 100755
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update
+++ b/core/modules/hardware-stats/data/opt/openslx/scripts/cron-system_usage_update
@@ -72,33 +72,7 @@ Please save your work and reboot this machine.
 
 Sie können einen bwLehrpool-Admin bitten, eine größere ID-44-Partition einzurichten.
 You could ask a bwLehrpool administrator to create a larger ID-44 partition."
-		for d in $(who | awk '{print $2}' | sort -u); do
-			if [ "${d:0:1}" = ":" ]; then
-				# X11
-				export DISPLAY=$d
-				export XAUTHORITY=$(ps a | grep " $DISPLAY " | grep -o -- '-auth.*$' | grep -m1 -v grep | awk '{print $2}')
-				notify-send -u critical "System instabil" "$WARN"
-				unset DISPLAY XAUTHORITY
-			elif [ "${d:0:3}" = "tty" ]; then
-				# Regular tty
-				cat > "/dev/$d" <<EOF
-				*
-				***************************
-				$WARN
-				***************************
-				*
-EOF
-			elif [ "${d:0:3}" = "pts" ]; then
-				# pts - xterm or ssh session
-				cat > "/dev/pts/${d:3}" <<EOF
-				*
-				***************************
-				$WARN
-				***************************
-				*
-EOF
-			fi
-		done
+	idle-daemon --send "warn $WARN"
 fi
 
 exit 0
diff --git a/core/modules/vmchooser2/data/etc/profile.d/10-vmchooser.sh b/core/modules/vmchooser2/data/etc/profile.d/10-vmchooser.sh
new file mode 100755
index 00000000..5371590d
--- /dev/null
+++ b/core/modules/vmchooser2/data/etc/profile.d/10-vmchooser.sh
@@ -0,0 +1,13 @@
+#!/bin/ash
+
+TEMP_HOME_DIR="$HOME"
+PERSISTENT_HOME_DIR="$HOME/PERSISTENT"
+
+if [ -d "$PERSISTENT_HOME_DIR" ]; then
+
+	rm -f -- "$TEMP_HOME_DIR/.config/openslx"
+	mkdir -p "$PERSISTENT_HOME_DIR/.config/openslx" "$TEMP_HOME_DIR/.config"
+	ln -nfs "$PERSISTENT_HOME_DIR/.config/openslx" "$TEMP_HOME_DIR/.config/openslx"
+
+fi
+
diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
index 08da8bff..f9b4ad3a 100755
--- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
+++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
@@ -77,6 +77,10 @@ if [ -n "$SLX_LOCATIONS" ]; then
 	EXTRA="$EXTRA --locations $SLX_LOCATIONS"
 fi
 
+if [ -n "$SLX_SCREEN_SAVER_TIMEOUT" ]; then
+	EXTRA="$EXTRA --allow-screensaver-disable"
+fi
+
 # No quotes around $EXTRA!
 exec vmchooser.real "$@" --url "$URL" --fullscreen --tab "$TAB" --start-uuid "$SLX_EXAM_START" $EXTRA
 
diff --git a/core/modules/vmware-common/module.conf.ubuntu b/core/modules/vmware-common/module.conf.ubuntu
new file mode 100644
index 00000000..90e88c04
--- /dev/null
+++ b/core/modules/vmware-common/module.conf.ubuntu
@@ -0,0 +1,3 @@
+REQUIRED_INSTALLED_PACKAGES="
+	gtk-update-icon-cache
+"
diff --git a/core/modules/vmware12/module.build b/core/modules/vmware12/module.build
index 6cda734e..99f7026b 100644
--- a/core/modules/vmware12/module.build
+++ b/core/modules/vmware12/module.build
@@ -212,8 +212,16 @@ build() {
 }
 
 post_copy() {
-	# Update Icon cache for vmplayer
-	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed."
+	# Update Icon cache for vmplayer, older versions had the version in their names, newer do not...
+	for guic in gtk-update-icon-cache{,-3.0} fail; do
+		if [ "$guid" = "fail" ]; then
+			pwarning "Updating icon cache failed."
+			break
+		fi
+		"$guid" "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/"
+	done
+	# fix vmware-usbarbitrator bug
+	date +'%Y.%m.%d' >"${TARGET_BUILD_DIR}/etc/arch-release"
 
 	mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/"
 	cp "${MODULE_BUILD_DIR}/lib/modules/$TARGET_KERNEL_LONG/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!"
diff --git a/core/modules/vmware15/module.build b/core/modules/vmware15/module.build
index ba8ad7e9..206dcd8d 100644
--- a/core/modules/vmware15/module.build
+++ b/core/modules/vmware15/module.build
@@ -146,8 +146,14 @@ post_copy() {
 	# FIXME: gconftool is copied without dependencies
 	tarcopy "$(find /usr/lib/ /usr/lib64 -name gconv -type d)" "$TARGET_BUILD_DIR"
 
-	# Update Icon cache for vmplayer
-	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed."
+	# Update Icon cache for vmplayer, older versions had the version in their names, newer do not...
+	for guic in gtk-update-icon-cache{,-3.0} fail; do
+		if [ "$guid" = "fail" ]; then
+			pwarning "Updating icon cache failed."
+			break
+		fi
+		"$guid" "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/"
+	done
 
 	mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/"
 	cp "${MODULE_BUILD_DIR}/lib/modules/$TARGET_KERNEL_LONG/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!"
diff --git a/core/targets/vmware15/kernel b/core/targets/vmware15/kernel
new file mode 120000
index 00000000..044f086d
--- /dev/null
+++ b/core/targets/vmware15/kernel
@@ -0,0 +1 @@
+../../modules/kernel
\ No newline at end of file
diff --git a/core/targets/vmware15/vmware-common b/core/targets/vmware15/vmware-common
new file mode 120000
index 00000000..bae6192c
--- /dev/null
+++ b/core/targets/vmware15/vmware-common
@@ -0,0 +1 @@
+../../modules/vmware-common
\ No newline at end of file
diff --git a/core/targets/vmware15/vmware15 b/core/targets/vmware15/vmware15
new file mode 120000
index 00000000..4918a2a2
--- /dev/null
+++ b/core/targets/vmware15/vmware15
@@ -0,0 +1 @@
+../../modules/vmware15
\ No newline at end of file