altboot:

- More kernel 2.6 changes
- Booting off SD seems to work as expected now
- Turn off printk before showing the menu, kernel messages make a mess of it
- Load keympas before showing the menu. init=/bin/sh is useless with a b0rked keymapping.

1 files changed, 8 insertions, 7 deletions

diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD
index 6ce0cdc9b3..d086cde344 100644
--- a/packages/altboot/files/altboot-menu/15-bootSD
+++ b/packages/altboot/files/altboot-menu/15-bootSD
@@ -24,23 +24,24 @@ run_module() {
 	/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
 
 	# We can't trust that the SD device file is there when running kernel 2.6 w/ udev
-	# Starting udev at this point may not be the best idea...
-#	echo "*1*"
+	# and starting udev at this point may not be the best idea...
+
 	if `uname -r | grep -q "2.6"`
 	then
-		#echo "***"
+		#Let's just assume the device file name never changes...
 		dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`"
 		part_no="`echo "/dev/mmcblk0p1" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`"
 		! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0
-		! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no
-		
-		#echo "[mknod /dev/mmcblk${dev_no}p${part_no}]"
+		! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no				
 	fi
 	
-	if test -n "$SD_KERNEL_MODULE"
+	# Kernel 2.6 has the SD driver compiled into the kernel
+	if test -n "$SD_KERNEL_MODULE"	
 	then
 		echo -n "Loading SD kernel module..."
 		/sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed"
+	else
+		echo "No SD kernel module, configured, assuming it's build-in"
 	fi
 
 	echo -n "Mounting $SD_MOUNTPOINT..."  >/dev/tty0