bootable/newinstaller
| Revision | 19c5cfa60dfda6c6cf7a405ee9773957637d907f (tree) |
|---|---|
| Time | 2009-08-19 21:45:06 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
add grub4dos for live usb menu selection
Android.mk (diff) initrd/init (diff) install/scripts/1-install (diff) usb/grub4dos (diff) usb/menu.lst (diff)| @@ -56,13 +56,15 @@ ANDROID_SRC := /android-system | ||
| 56 | 56 | USB_BOOT := $(PRODUCT_OUT)/usb_boot |
| 57 | 57 | |
| 58 | 58 | usb_tmp_img := $(PRODUCT_OUT)/usb_tmp.img |
| 59 | -$(usb_tmp_img): $(BUILT_IMG) | $(MKEXT2IMG) | |
| 59 | +$(usb_tmp_img): $(wildcard $(LOCAL_PATH)/usb/*) $(BUILT_IMG) | $(ACP) $(MKEXT2IMG) | |
| 60 | 60 | rm -rf $(USB_BOOT) |
| 61 | 61 | mkdir -p $(USB_BOOT)$(ANDROID_SRC) |
| 62 | - echo -n "$(BOARD_KERNEL_CMDLINE) SRC=$(ANDROID_SRC)" > $(USB_BOOT)/cmdline | |
| 63 | - ln $^ $(USB_BOOT) | |
| 64 | - mv $(USB_BOOT)/{ramdisk.img,system.*} $(USB_BOOT)$(ANDROID_SRC) | |
| 65 | - mv $(USB_BOOT)/initrd.img $(USB_BOOT)/ramdisk | |
| 62 | + touch $(USB_BOOT)/ramdisk | |
| 63 | + echo 1 > $(USB_BOOT)/cmdline | |
| 64 | + ln $(BUILT_IMG) $(USB_BOOT)$(ANDROID_SRC) | |
| 65 | + $(ACP) -fp $(<D)/* $(<D)/../install/grub/android-x86.xpm.gz $(USB_BOOT) | |
| 66 | + ln -s grub4dos $(USB_BOOT)/kernel | |
| 67 | + $(hide) sed -i "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $(USB_BOOT)/menu.lst | |
| 66 | 68 | num_blocks=`du -sk $(USB_BOOT) | tail -n1 | awk '{print $$1;}'`; \ |
| 67 | 69 | num_inodes=`find $(USB_BOOT) | wc -l`; \ |
| 68 | 70 | $(MKEXT2IMG) -d $(USB_BOOT) -b `expr $$num_blocks + 20480` -N `expr $$num_inodes + 15` -m 0 $@ |
| @@ -8,6 +8,13 @@ | ||
| 8 | 8 | # with Android-x86 project. |
| 9 | 9 | # |
| 10 | 10 | |
| 11 | +try_mount() | |
| 12 | +{ | |
| 13 | + RW=$1; shift | |
| 14 | + # FIXME: any way to mount ntfs gracefully? | |
| 15 | + mount -o $RW $@ || mount.ntfs-3g -o rw,force $@ | |
| 16 | +} | |
| 17 | + | |
| 11 | 18 | if [ -n "$DEBUG" ]; then |
| 12 | 19 | LOG=/tmp/log |
| 13 | 20 | set -x |
| @@ -27,6 +34,8 @@ export PATH=$PATH:/system/bin | ||
| 27 | 34 | if [ -n "$DEBUG" -o -n "$INSTALL" ]; then |
| 28 | 35 | mknod /dev/tty2 c 4 2 && openvt |
| 29 | 36 | mknod /dev/tty3 c 4 3 && openvt |
| 37 | +else | |
| 38 | + echo 0 0 0 0 > /proc/sys/kernel/printk | |
| 30 | 39 | fi |
| 31 | 40 | |
| 32 | 41 | echo -n Detecting Android... |
| @@ -35,10 +44,7 @@ while [ 1 ]; do | ||
| 35 | 44 | mdev -s |
| 36 | 45 | |
| 37 | 46 | for device in /dev/sr* /dev/sd[a-z]*; do |
| 38 | - # FIXME: any way to mount ntfs gracefully? | |
| 39 | - mount -o ro $device /mnt || \ | |
| 40 | - mount.ntfs-3g -o rw $device /mnt || \ | |
| 41 | - continue | |
| 47 | + try_mount ro $device /mnt || continue | |
| 42 | 48 | cd /mnt/$SRC |
| 43 | 49 | if [ ! -e ramdisk.img -o ! \( -e system.img -o -e system.sfs \) ]; then |
| 44 | 50 | cd / |
| @@ -103,11 +103,7 @@ install_to() | ||
| 103 | 103 | mountpoint -q /hd && umount /hd |
| 104 | 104 | while [ 1 ]; do |
| 105 | 105 | format_fs $1 |
| 106 | - for m in mount /sbin/mount.*; do | |
| 107 | - # FIXME: how to mount fuse filesystem automatically? | |
| 108 | - $m /dev/$1 /hd && break | |
| 109 | - done | |
| 110 | - [ $? -eq 0 ] && break | |
| 106 | + try_mount rw /dev/$1 /hd && break | |
| 111 | 107 | dialog --clear --title " Error " --defaultno --yesno \ |
| 112 | 108 | "\n Cannot mount /dev/$1\n Do you want to format it?" 8 37 |
| 113 | 109 | [ $? -ne 0 ] && return 255 |
| @@ -177,7 +173,6 @@ install_hd() | ||
| 177 | 173 | |
| 178 | 174 | do_install() |
| 179 | 175 | { |
| 180 | - echo "0 0 0 0" > /proc/sys/kernel/printk | |
| 181 | 176 | until install_hd; do |
| 182 | 177 | if [ $retval -eq 255 ]; then |
| 183 | 178 | dialog --title ' Error! ' --yes-label Retry --no-label Reboot \ |
Fork