Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

diff --git a/initrd/init b/initrd/init
index d64f757..af139aa 100755 (executable)
--- a/initrd/init
+++ b/initrd/init
@@ -96,7 +96,6 @@ check_root()
                mount --move /mnt /iso
                mkdir /mnt/iso
                mount -o loop /iso/$iso /mnt/iso
-               SRC=iso
        fi
        if [ -e /mnt/$SRC/$RAMDISK ]; then
                zcat /mnt/$SRC/$RAMDISK | cpio -id > /dev/null
@@ -117,7 +116,7 @@ check_root()
        elif [ -d /mnt/$SRC/system ]; then
                remount_rw
                mount --bind /mnt/$SRC/system system
-       elif [ -e /mnt/build.prop ]; then
+       elif [ -z "$SRC" -a -e /mnt/build.prop ]; then
                mount --bind /mnt system
        else
                rm -rf *
@@ -155,6 +154,7 @@ echo -n Detecting Android-x86...
 for c in `cat /proc/cmdline`; do
        case $c in
                iso-scan/filename=*)
+                       SRC=iso
                        eval `echo $c | cut -b1-3,18-`
                        ;;
                *)