X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=initrd%2Finit;h=dd775e604bbd45ad6648764ae614ca2f4510ca49;hb=a1e54494eb9acb2d467432f93ca5c206cd6aebff;hp=7b0140f650ba51b03f58d92a680624208fd87346;hpb=ad020bd8b5ea6d5fd8a0cd6425a904300f18691f;p=android-x86%2Fbootable-newinstaller.git diff --git a/initrd/init b/initrd/init index 7b0140f..dd775e6 100755 --- a/initrd/init +++ b/initrd/init @@ -3,8 +3,6 @@ # By Chih-Wei Huang # and Thorsten Glaser # -# Last updated 2014/01/15 -# # License: GNU Public License # We explicitely grant the right to use the scripts # with Android-x86 project. @@ -12,8 +10,11 @@ PATH=/sbin:/bin:/system/bin:/system/xbin; export PATH +# auto installation +[ -n "$AUTO_INSTALL" ] && INSTALL=1 + # configure debugging output -if [ -n "$DEBUG" ]; then +if [ -n "$DEBUG" -o -n "$INSTALL" ]; then LOG=/tmp/log set -x else @@ -62,10 +63,20 @@ try_mount() RW=$1; shift if [ "${ROOT#*:/}" != "$ROOT" ]; then # for NFS roots, use nolock to avoid dependency to portmapper - RW="nolock,$RW" + mount -o $RW,noatime,nolock $@ + return $? fi - # FIXME: any way to mount ntfs gracefully? - mount -o $RW $@ || mount.ntfs-3g -o rw,force $@ + case $(blkid $1) in + *TYPE=*ntfs*) + mount.ntfs-3g -o rw,force $@ + ;; + *TYPE=*) + mount -o $RW,noatime $@ + ;; + *) + return 1 + ;; + esac } check_root() @@ -78,25 +89,41 @@ check_root() else dev=$1 fi - try_mount ro $dev /mnt && [ -e /mnt/$SRC/ramdisk.img ] - [ $? -ne 0 ] && return 1 - zcat /mnt/$SRC/ramdisk.img | cpio -id > /dev/null + try_mount ro $dev /mnt || return 1 + if [ -n "$iso" -a -e /mnt/$iso ]; then + mount --move /mnt /iso + mkdir /mnt/iso + mount -o loop /iso/$iso /mnt/iso + fi + if [ -e /mnt/$SRC/$RAMDISK ]; then + zcat /mnt/$SRC/$RAMDISK | cpio -id > /dev/null + elif [ -b /dev/$RAMDISK ]; then + zcat /dev/$RAMDISK | cpio -id > /dev/null + else + return 1 + fi if [ -e /mnt/$SRC/system.sfs ]; then - mount -o loop /mnt/$SRC/system.sfs /sfs - mount -o loop /sfs/system.img system + mount -o loop,noatime /mnt/$SRC/system.sfs system + if [ -e system/system.img ]; then + mount --move system /sfs + mount -o loop,noatime /sfs/system.img system + fi elif [ -e /mnt/$SRC/system.img ]; then remount_rw - mount -o loop /mnt/$SRC/system.img system - elif [ -d /mnt/$SRC/system ]; then + mount -o loop,noatime /mnt/$SRC/system.img system + elif [ -s /mnt/$SRC/system/build.prop ]; then remount_rw mount --bind /mnt/$SRC/system system + elif [ -z "$SRC" -a -s /mnt/build.prop ]; then + mount --bind /mnt system else rm -rf * return 1 fi - mkdir cache mnt - mount -t tmpfs tmpfs cache + mkdir -p mnt echo " found at $1" + rm /sbin/mke2fs + hash -r } remount_rw() @@ -108,9 +135,10 @@ remount_rw() debug_shell() { - if which mksh >/dev/null 2>&1; then + if [ -x system/bin/sh ]; then echo Running MirBSD Korn Shell... - USER="($1)" mksh -l 2>&1 + USER="($1)" system/bin/sh -l 2>&1 + [ $? -ne 0 ] && /bin/sh 2>&1 else echo Running busybox ash... sh 2>&1 @@ -120,11 +148,23 @@ debug_shell() echo -n Detecting Android-x86... [ -z "$SRC" -a -n "$BOOT_IMAGE" ] && SRC=`dirname $BOOT_IMAGE` +[ -z "$RAMDISK" ] && RAMDISK=ramdisk.img || RAMDISK=${RAMDISK##/dev/} + +for c in `cat /proc/cmdline`; do + case $c in + iso-scan/filename=*) + SRC=iso + eval `echo $c | cut -b1-3,18-` + ;; + *) + ;; + esac +done mount -t tmpfs tmpfs /android cd /android while :; do - for device in ${ROOT:-/dev/[hmsv][dmr][0-9a-z]*}; do + for device in ${ROOT:-/dev/[hmnsv][dmrv][0-9a-z]*}; do check_root $device && break 2 mountpoint -q /mnt && umount /mnt done @@ -134,37 +174,38 @@ done ln -s mnt/$SRC /src ln -s android/system / -ln -s ../system/lib/modules /lib -ln -s ../system/lib/firmware /lib +ln -s ../system/lib/firmware ../system/lib/modules /lib if [ -n "$INSTALL" ]; then - cd / - zcat /src/install.img | cpio -iud > /dev/null + zcat /src/install.img | ( cd /; cpio -iud > /dev/null ) fi -if [ -x system/bin/ln -a \( -n "$DEBUG" -o -n "$BUSYBOX" \) ]; then - mv /bin /lib . - system/bin/ln -s android/lib /lib - system/bin/ln -s android/bin /bin - sed -i 's|\(PATH *\)\(/sbin\)|\1/bin:\2|' init.rc - mv /sbin/* sbin +if [ -x system/bin/ln -a -n "$BUSYBOX" ]; then + mv -f /bin /lib . + sed -i 's|\( PATH.*\)|\1:/bin|' init.environ.rc + rm /sbin/modprobe + busybox mv /sbin/* sbin rmdir /sbin - ln -s android/sbin / + ln -s android/bin android/lib android/sbin / + hash -r fi +# load scripts +for s in `ls /scripts/* /src/scripts/*`; do + test -e "$s" && source $s +done + # ensure keyboard driver is loaded -[ -n "$INSTALL" -o -n "$DEBUG" ] && modprobe atkbd +if [ -n "$INSTALL" -o -n "$DEBUG" ]; then + busybox modprobe -a atkbd hid-apple + auto_detect & +fi if [ 0$DEBUG -gt 0 ]; then echo -e "\nType 'exit' to continue booting...\n" debug_shell debug-found fi -# load scripts -for s in `ls /scripts/* /src/scripts/*`; do - test -e "$s" && source $s -done - # A target should provide its detect_hardware function. # On success, return 0 with the following values set. # return 1 if it wants to use auto_detect @@ -178,21 +219,25 @@ mount_sdcard setup_tslib setup_dpi post_detect -find_network_dev_name if [ 0$DEBUG -gt 1 ]; then echo -e "\nUse Alt-F1/F2/F3 to switch between virtual consoles" echo -e "Type 'exit' to enter Android...\n" debug_shell debug-late + SETUPWIZARD=${SETUPWIZARD:-0} fi +[ "$SETUPWIZARD" = "0" ] && echo "ro.setupwizard.mode=DISABLED" >> default.prop + [ -n "$DEBUG" ] && SWITCH=${SWITCH:-chroot} # We must disable mdev before switching to Android # since it conflicts with Android's init echo > /proc/sys/kernel/hotplug +export ANDROID_ROOT=/system + exec ${SWITCH:-switch_root} /android /init # avoid kernel panic