merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)

3 files changed, 31 insertions, 10 deletions

diff --git a/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig
index c9b74791..ec98ff70 100644
--- a/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig
+++ b/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig
@@ -66,10 +66,15 @@ HEREEND
 	cd "${TEMP_EXTRACT_DIR}"
 	# first we look for local config.tgz files, which we merge with the common
 	# config.tgz files
-	local LOCAL_CONFIG_DIR="openslx-configs/${SLX_LOCAL_CONFIG}"
-	if [ -n "${SLX_LOCAL_CONFIG}" -a -d "${LOCAL_CONFIG_DIR}" ]; then
-		tarcopy "${LOCAL_CONFIG_DIR}" "${TEMP_EXTRACT_DIR}"
-		echo "Merged local configuration files for '${SLX_LOCAL_CONFIG}'"
+	if [ -n "${SLX_LOCAL_CONFIG}" ]; then
+		local MOD
+		for MOD in ${SLX_LOCAL_CONFIG}; do
+			local LOCAL_CONFIG_DIR="openslx-configs/${MOD}"
+			if [ -d "${LOCAL_CONFIG_DIR}" ]; then
+				tarcopy "${LOCAL_CONFIG_DIR}" "${TEMP_EXTRACT_DIR}"
+				echo "Merged local configuration files for '${MOD}'"
+			fi
+		done
 	fi
 	# purge openslx-configs/*
 	rm -rf -- "openslx-configs/"
@@ -91,6 +96,17 @@ HEREEND
 #
 
 fetch_sysconfig || drop_shell "Could not download remote config"
+if ! ash -n "${CONFIG}-remote"; then
+	echo -e "\n\tFATAL: Could not download configuration!"
+	echo -e "\tAborting boot since the system would be in an unusable state."
+	echo -en "\tRebooting in 60 seconds"
+	timeout=60
+	while [ $(( timeout-- )) -gt 0 ]; do
+		echo -n "."
+		sleep 1
+	done
+	echo b > /proc/sysrq-trigger
+fi
 . "${CONFIG}-remote" || drop_shell "Could not source remote config"
 fetch_config_files || drop_shell "Could not download config.tgz"
 update_sysconfig || drop_shell "Could not update sysconfig"
diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network b/core/rootfs/rootfs-stage31/data/inc/setup_network
index 13c52289..956df03c 100644
--- a/core/rootfs/rootfs-stage31/data/inc/setup_network
+++ b/core/rootfs/rootfs-stage31/data/inc/setup_network
@@ -26,14 +26,21 @@ mkdir -p "${FUTURE_ROOT}/etc/udev/rules.d"
 IP_OUT=$(ip a | grep -B 1 "/ether" | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-Z:]+) .*$#\1==\2#')
 
 if ! echo "$IP_OUT" | grep -q -- "$MAC"; then
-	drop_shell "Boot interface not found in interface list. NIC driver missing?"
+	drop_shell "---
+$(ip a)
+---
+$IP_OUT
+---
+
+Boot interface $MAC not found in interface list. NIC driver missing?"
+	:
 fi
 
 for LINE in $IP_OUT; do
 	IFACE=$(echo "$LINE" | awk -F '==' '{printf $1}')
 	IFMAC=$(echo "$LINE" | awk -F '==' '{printf $2}' | tr '[A-Z]' '[a-z]') # udev requires mac addesses to be lowercase (a-f), see http://www.debianhelp.co.uk/udev.htm
 	echo "${IFACE} = ${IFMAC}"
-	
+
 	if [ "x$IFMAC" == "x$MAC" ]; then
 		brctl addbr "$BRIDGE" || drop_shell "Could not create bridge $BRIDGE"
 		brctl stp "$BRIDGE" 0
diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_stage32 b/core/rootfs/rootfs-stage31/data/inc/setup_stage32
index 5ec5a69d..070583aa 100644
--- a/core/rootfs/rootfs-stage31/data/inc/setup_stage32
+++ b/core/rootfs/rootfs-stage31/data/inc/setup_stage32
@@ -58,11 +58,9 @@ if [ $SPLASH -eq 1 ]; then
 	fi
 fi
 
-# Kinda specific for virtualization environment: Autologin and run VM for benchmarks
-if [ -n "$SLX_BENCHMARK_VM" ]; then
+# Auto login to demo user requested?
+if [ -n "$SLX_AUTOLOGIN" ]; then
 	# Enable KDM autologin for demo user
 	sed -i 's/^AutoLoginUser=.*//;s/^AutoLoginEnable=.*/AutoLoginEnable=true\nAutoLoginUser=demo/' "${FUTURE_ROOT}/etc/kde4/kdm/kdmrc"
-	# Running the VM automatically has to be taken care of by run-virt and vmchooser. SLX_BENCHMARK_VM should contain
-	# a numeric value for the index in vmchooser
 fi