Commit: 48ede358f27cdd0af529460e2122b086269b3b92 - bootable-newinstaller (git)

bootable/newinstaller

Commit MetaInfo

• Révision: 48ede358f27cdd0af529460e2122b086269b3b92 (tree)
• l'heure: 2011-05-23 19:19:23
• Auteur: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Message de Log

init: ensure keyboard driver is loaded in debug or installation mode

Change Summary

• modified: initrd/init
• modified: install/scripts/1-install

Modification

--- a/initrd/init
+++ b/initrd/init
@@ -125,6 +125,9 @@ if [ -n "$DEBUG" -o -n "$BUSYBOX" ]; then
 	ln -s android/sbin /
 fi
 
+# ensure keyboard driver is loaded
+[ -n "$INSTALL" -o -n "$DEBUG" ] && modprobe atkbd
+
 if [ -n "$DEBUG" ]; then
 	echo -e "\nType 'exit' to continue booting...\n"
 	debug_shell debug-found

--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -171,7 +171,7 @@ create_sdcard_img()
 		newfs_msdos -L sdcard /dev/loop7 > /dev/tty7 2>&1
 	fi
 	if [ $? -eq 0 ]; then
-		sed -i "s|\(SDCARD=\S\+\?\s*\)||; s|\(SRC=\S\+\?\s*\)|\1 SDCARD=/$sdcard|" $menulst
+		[ -n "menulst" ] && sed -i "s|\(SDCARD=\S\+\?\s*\)||; s|\(SRC=\S\+\?\s*\)|\1 SDCARD=/$sdcard|" $menulst
 		msg="The fake SD card is created successfully"
 	else
 		msg="Failed to create a fake SD card"