OSDN Git Service

init: ensure keyboard driver is loaded in debug or installation mode froyo-x86 android-x86-2.2-r2
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 23 May 2011 10:19:03 +0000 (18:19 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 23 May 2011 10:19:23 +0000 (18:19 +0800)
initrd/init
install/scripts/1-install

index 26350fd..2c1df36 100755 (executable)
@@ -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
index bf62f22..bc3259a 100644 (file)
@@ -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"