From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Fri, 25 Nov 2016 09:48:07 +0000 (+0800)
Subject: initrd: allow to specify ramdisk path
X-Git-Tag: android-x86-6.0-r2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b3bb97026deb6e40b695b0586f51c754220dfb83;p=android-x86%2Fbootable-newinstaller.git

initrd: allow to specify ramdisk path

Now the ramdisk.img could be specified by the RAMDISK variable
in the kernel cmdline.
---

diff --git a/initrd/init b/initrd/init
index ed0202f..de90a84 100755
--- a/initrd/init
+++ b/initrd/init
@@ -84,10 +84,10 @@ check_root()
 		mkdir /mnt/iso
 		mount -o loop /iso/$iso /mnt/iso
 		SRC=iso
-	elif [ ! -e /mnt/$SRC/ramdisk.img ]; then
+	elif [ ! -e /mnt/$SRC/$RAMDISK ]; then
 		return 1
 	fi
-	zcat /mnt/$SRC/ramdisk.img | cpio -id > /dev/null
+	zcat /mnt/$SRC/$RAMDISK | cpio -id > /dev/null
 	if [ -e /mnt/$SRC/system.sfs ]; then
 		mount -o loop,noatime /mnt/$SRC/system.sfs /sfs
 		mount -o loop,noatime /sfs/system.img system
@@ -128,6 +128,7 @@ debug_shell()
 echo -n Detecting Android-x86...
 
 [ -z "$SRC" -a -n "$BOOT_IMAGE" ] && SRC=`dirname $BOOT_IMAGE`
+[ -z "$RAMDISK" ] && RAMDISK=ramdisk.img
 
 for c in `cat /proc/cmdline`; do
 	case $c in
diff --git a/install/scripts/1-install b/install/scripts/1-install
index 5c226ab..853aea2 100644
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -336,7 +336,7 @@ install_to()
 		"\nDo you want to install /system directory as read-write?\n\nMaking /system be read-write is easier for debugging, but it needs more disk space and longer installation time." 10 61
 	instal_rw=$?
 
-	files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/ramdisk.img"
+	files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK"
 	if [ $instal_rw -eq 0 ]; then
 		if [ "$fs" = "vfat" -o "$fs" = "fuseblk" ]; then
 			[ -e /sfs/system.img ] && sysimg="/sfs/system.img" || sysimg="mnt/$SRC/system.*"