altboot:

- Fixed a bug where altboot wouldn't prompt for the menu but do init 5 instead
- Cosmetic changes (Thanks to andrewy@#openzaurus)
- Fixed a bug where pressing enter to start altboot would launch the default option. (Thanks to prh@#openzaurus)
- Disabled "Copy RootFS" menu item as this part is not finished, yet.

2 files changed, 9 insertions, 2 deletions

diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 33e869bbe1..88e546a059 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -42,6 +42,11 @@ run_module() {
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
 	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
 	
+	if test -z "$nfs_hosts"
+	then
+		echo -e "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
+		exit 1
+	fi
 	
 	# WLAN with DHCP needs some time to get a lease, set up the routing, etc.	
 	echo -n "Waiting for WLAN"
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
index 1949f20b48..13f98a0d41 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
+++ b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
@@ -1,6 +1,8 @@
 # !/bin/sh
 M_TITLE="Copy rootfs to SD/CF"
 
+# Unfinished script.
+exit 0
 
 die() {
 	echo "ERROR: $1" >/dev/tty0
@@ -50,7 +52,7 @@ ask_target() {
 ask_format() {
 	if test "$ROOTFS_TARGET_FS" != ext2
 	then
-		echo -e "\nYou are not using the ext2 filesystem on your target.\nYou now have two choices:"
+		echo -e "\nYou are not using the ext2 filesystem on your target ($ROOTFS_TARGET_FS)$.\nYou now have two choices:"
 		echo -e "\t[1] Reformat to ext2"
 		echo -e "\t[2] Use an image-file ontop of the existing filesystem"
 		
@@ -113,7 +115,7 @@ ask_confirm() {
 
 direct_install() {
 
-	format_target
+	#format_target
 		
 	echo -n "Creating temporary directory..."
 	mkdir -p /media/temp && echo ok || die "mkdir -p /media/temp failed!"