Merge remote-tracking branch 'x86/pie-x86' into q-x86

diff --git a/initrd/init b/initrd/init
index 16aaed2..796564f 100755 (executable)
--- a/initrd/init
+++ b/initrd/init
@@ -153,7 +153,7 @@ done
 
 cd /
 while :; do
-       for device in ${ROOT:-/dev/[hmnsv][dmrv][0-9a-z]*}; do
+       for device in ${ROOT:-/dev/[hmnsvx][dmrv][0-9a-z]*}; do
                check_root $device && break 2
                mountpoint -q /mnt && umount /mnt
        done

diff --git a/install/scripts/1-install b/install/scripts/1-install
index bfa2d86..d83994f 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
 }
@@ -373,7 +373,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))