Merge branch 'master' of simonslx:openslx-ng/tm-scripts

6 files changed, 15 insertions, 19 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index ee90cf15..bf11d9aa 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -15,7 +15,7 @@
 # debug shell
 drop_shell() {
 	[ $# -gt 0 ] && echo $@
-	echo "Dropping debug shell. CTRL + D will continue booting."
+	echo "CTRL + D will continue booting."
 	setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
 }
 
@@ -49,8 +49,8 @@ read KCL < /proc/cmdline
 export KCL
 for opts in ${KCL}; do
 	case ${opts} in
-		debug*)
-			DEBUG=1 ;;
+		debug=*)
+			DEBUG=${opts#debug=} ;;
 		splash*)
 			SPLASH=1 ;;
 		ip=*)
@@ -79,6 +79,8 @@ fi
 mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
 mount -n -t tmpfs none /dev/shm/uniontmp
 
+[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell (before network)."
+
 echo "Setup networking..." # Source script so the variables are still available to us
 . "/bin/setup_network" || echo "Error setting up network"
 
@@ -93,7 +95,7 @@ else
 	mount -t squashfs /mnt/*.sqfs /rorootfs || drop_shell "Problem mounting Squashfs."
 fi
 			
-[ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell."
+[ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: squashfs/nfs mounted, before aufs."
 
 echo "Building aufs..."
 mv /mnt/modprobing /dev/shm/uniontmp
@@ -102,6 +104,8 @@ mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt || drop_shell "P
 mkdir -p /mnt/uniontmp /mnt/tmp
 mount -n --move /dev/shm/uniontmp /mnt/uniontmp || drop_shell "Problem moving uniontmp."
 
+[ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after aufs'ing."
+
 # create udev rule for nic we booted from
 cat > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" <<HEREEND
 SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="$MAC", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"
@@ -118,6 +122,8 @@ SLX_PXE_DNS='$DNS_SERVER'
 SLX_PXE_MAC='$BRIDGEMAC'
 HEREEND
 
+[ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root."
+
 for mnt in proc sys run ; do
   umount -n "$mnt"
 done
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index 521b45ed..b493c370 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -7,6 +7,7 @@ REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
 				kernel/drivers/acpi/button.ko
 	                       	kernel/drivers/gpu/drm/drm*.ko
 	                       	kernel/drivers/gpu/drm/*/*.ko
+				kernel/drivers/hid/hid-generic.ko
 				kernel/drivers/i2c/algos/i2c-algo-bit.ko
 				kernel/drivers/i2c/i2c-core.ko
 				kernel/drivers/usb/usb-common.ko
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mount-lib-virt b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mount-lib-virt
deleted file mode 100755
index ac0dd1a4..00000000
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mount-lib-virt
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-. /opt/openslx/config || exit 1
-
-export PATH=/opt/openslx/bin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/usr/sbin:/bin:/sbin:/usr/bin:/usr/sbin
-
-mkdir -p /var/lib/virt
-mount -t nfs -o ro,async,nolock,vers=3 "$SLX_VM_NFS" /var/lib/virt
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 162dcdc2..a796f738 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -70,8 +70,7 @@ post_copy() {
 		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
 
 	# set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin
-	echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin\"" \
-        	> "${TARGET_BUILD_DIR}/etc/environment"
+	add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin"
 
 	# copy static files
 	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed."
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 27421166..a2dd3987 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -50,8 +50,7 @@ REQUIRED_LIBRARIES="	libcap
 			libresolv
 			libau"
 REQUIRED_DIRECTORIES="/lib/xtables"
-REQUIRED_FILES="	/etc/environment
-			/etc/issue
+REQUIRED_FILES="	/etc/issue
 			/etc/inputrc
 			/etc/localtime
 			/etc/login.defs
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index af6f2546..89ffb6a1 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,7 +1,7 @@
 REQUIRED_MODULES="	kernel"
 REQUIRED_INSTALLED_PACKAGES="nfs-client xfsprogs squashfs timezone"
 REQUIRED_CONTENT_PACKAGES="timezone"
-REQUIRED_DIRECTORIES="/usr/lib/xtables"
+REQUIRED_DIRECTORIES="/usr/$LIB64/xtables"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
@@ -20,8 +20,7 @@ REQUIRED_LIBRARIES="	libcap
 			libtinfo
 			libresolv
 			libau"
-REQUIRED_FILES="	/etc/environment
-			/etc/issue
+REQUIRED_FILES="	/etc/issue
 			/etc/inputrc
 			/etc/localtime
 			/etc/login.defs