altboot:

- Removed multiple die() functions
- Altboot no longer activates an off-flash altboot-menu when not
  booting from flash
- Added a debug_echo function which is disabled in non-rc and
  non-snapshot builds
- RC's and snapshots now spawn a debug shell on tty4 right after
  the kernel is booted
- die() messages are now colored red/white, debug is purple(?)/white
- Fixed start_networking() on collie and made it a little bit more verbose

6 files changed, 12 insertions, 30 deletions

diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
index 3cf8c506b0..b573e7a10c 100644
--- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
+++ b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
@@ -8,12 +8,7 @@
 M_TITLE="Boot USB Storage"
 
 test "$USB_HOST_AVAILABLE" = "yes" || exit 0
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
+       
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 352b29ed07..9a36b8ed01 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -9,11 +9,6 @@
 
 M_TITLE="Boot from NFS"
 
-die() {
-	echo -e "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 
@@ -24,9 +19,7 @@ run_module() {
 			
 	nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `"
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
-	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
-	
-	WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | awk '{print $1}'`"
+	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"			
 		
 	start_networking "$nfs_host"	
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
index 2ee92cd27e..cb8b2722d5 100644
--- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
+++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
@@ -2,11 +2,6 @@
 
 M_TITLE="Install RootFS from tar.gz"
 
-# die() {
-# 	echo "ERROR: $1" >/dev/tty0
-# 	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-# }
-
 run_module(){
 	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/70-setKernel b/packages/altboot/files/altboot-menu/Advanced/70-setKernel
index a2c1efa81b..6192232a73 100644
--- a/packages/altboot/files/altboot-menu/Advanced/70-setKernel
+++ b/packages/altboot/files/altboot-menu/Advanced/70-setKernel
@@ -40,11 +40,13 @@ run_module() {
 			
 			get_pref "kexec_klist" "$junk" KEXEC_SELECTED_KERNEL && break
 
-		done
-		
-		echo "Using [$KEXEC_SELECTED_KERNEL]"
+		done		
+	else
+		KEXEC_SELECTED_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `"
 	fi
 	
+	echo -e "\nUsing [$KEXEC_SELECTED_KERNEL]"
+	
 	if ! test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" 
 	then
 		echo -e "\nWARNING: This kernel has not been configured."
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
index 27b6a871a6..e294df683f 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
+++ b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
@@ -38,11 +38,13 @@ run_module() {
 			
 			get_pref "kexec_klist" "$junk" KEXEC_KERNEL && break
 
-		done
-		
-		echo "Using [$KEXEC_KERNEL]"
+		done				
+	else
+		KEXEC_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `"
 	fi
 	
+	echo -e "\nUsing [$KEXEC_KERNEL]"
+	
 	configure_rootdev
 	configure_roottype
 	configure_verbose
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
index 13f98a0d41..af6bd38c1d 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
+++ b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
@@ -4,11 +4,6 @@ M_TITLE="Copy rootfs to SD/CF"
 # Unfinished script.
 exit 0
 
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 ask_target() {
 	available_disks="`mount | grep "/media" | grep -v ram | awk '{print $3}'`"