init: support Xen hypervisor device

[android-x86/bootable-newinstaller.git] / install / scripts / 1-install

diff --git a/install/scripts/1-install b/install/scripts/1-install
index c427f24..1a50ebf 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -61,7 +61,7 @@ find_partition()
 
 list_disks()
 {
-       for b in /sys/block/[shv]d[a-z] /sys/block/mmcblk? /sys/block/nvme*; do
+       for b in /sys/block/[shv]d[a-z] /sys/block/xvd[a-z] /sys/block/mmcblk? /sys/block/nvme*; do
                [ -d $b ] && echo $b
        done
 }
@@ -171,7 +171,7 @@ select_dev()
                for i in /sys/block/$d/$d*; do
                        [ -d $i ] || continue
                        echo $i | grep -qE "loop|ram|sr|boot|rpmb" && continue
-                       f=$(grep "`basename $i`" $tempfile || printf "%-11s%-29s" `basename $i` unknown)
+                       f=$(grep "`basename $i`" $tempfile || printf "%-11s%-30s" `basename $i` unknown)
                        sz=$(size_gb $i)
                        [ "$sz" = "0.00GB" ] || printf "$f%10s\n" $sz
                done
@@ -343,6 +343,9 @@ try_upgrade()
                prev=hd/$choice
                if [ -d "$prev" ]; then
                        mv $prev $1
+                       for d in `find hd -type l -maxdepth 1`; do
+                               [ "`readlink $d`" = "$choice" ] && ln -sf `basename $1` $d
+                       done
                        rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
                        [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
                fi
@@ -354,7 +357,7 @@ get_part_info()
        d=0
        while [ 1 ]; do
                h=`echo $d | awk '{ printf("%c", $1+97) }'`
-               for part in /sys/block/[shv]d$h/$1 /sys/block/mmcblk$d/$1 /sys/block/nvme0n$(($d+1))/$1; do
+               for part in /sys/block/[shv]d$h/$1 /sys/block/xvd$h/$1 /sys/block/mmcblk$d/$1 /sys/block/nvme0n$(($d+1))/$1; do
                        [ -d $part ] && break 2
                done
                d=$(($d+1))
@@ -484,6 +487,8 @@ install_to()
                fi
        fi
 
+       try_upgrade hd/$asrc
+
        ! test -f hd/$asrc/system.img -o -d hd/$asrc/system
        set_answer_if_auto $?
        adialog --title " Question " --defaultno --yesno \
@@ -505,7 +510,7 @@ install_to()
        for s in `du -sk $files | awk '{print $1}'`; do
                size=$(($size+$s))
        done
-       try_upgrade hd/$asrc
+
        mkdir -p hd/$asrc
        cd hd/$asrc
        rm -rf system*
@@ -547,6 +552,7 @@ install_hd()
                        answer=${answer:-$(blkid | grep -v loop | sort | grep ext4 | cut -d: -f1 | head -1)}
                        [ -b "$answer" -o -b /dev/$answer ] && answer=`basename $answer` || answer=
                        AUTO_UPDATE=${answer:-$AUTO_UPDATE}
+                       [ -z "$AUTO_UPDATE" ] && AUTO_INSTALL=
                        ;;
                *)
                        [ -z "$answer" ] && set_answer_if_auto Create