From: Doug <maildoug@gmail.com>
Date: Thu, 28 Oct 2021 17:37:02 +0000 (+0800)
Subject: init: support Xen hypervisor device
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fbootable-newinstaller.git;a=commitdiff_plain;h=d9cf94c51253afa7fd8dbefe1fe7635c07e55cc6

init: support Xen hypervisor device
---

diff --git a/initrd/init b/initrd/init
index e8899a7..b204c27 100755
--- a/initrd/init
+++ b/initrd/init
@@ -161,7 +161,7 @@ done
 mount -t tmpfs tmpfs /android
 cd /android
 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 644b3d6..1a50ebf 100644
--- 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
 }
@@ -357,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))