Android-x86
Forkbootable/newinstaller
| Revision | 33760c95f49b7ec4a2146af892c3bd60b8fe15e5 (tree) |
|---|---|
| Time | 2019-12-03 11:47:04 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/pie-x86' into q-x86
initrd/init (diff)| @@ -96,7 +96,6 @@ check_root() | ||
| 96 | 96 | mount --move /mnt /iso |
| 97 | 97 | mkdir /mnt/iso |
| 98 | 98 | mount -o loop /iso/$iso /mnt/iso |
| 99 | - SRC=iso | |
| 100 | 99 | fi |
| 101 | 100 | if [ -e /mnt/$SRC/$RAMDISK ]; then |
| 102 | 101 | zcat /mnt/$SRC/$RAMDISK | cpio -id > /dev/null |
| @@ -117,7 +116,7 @@ check_root() | ||
| 117 | 116 | elif [ -d /mnt/$SRC/system ]; then |
| 118 | 117 | remount_rw |
| 119 | 118 | mount --bind /mnt/$SRC/system system |
| 120 | - elif [ -e /mnt/build.prop ]; then | |
| 119 | + elif [ -z "$SRC" -a -e /mnt/build.prop ]; then | |
| 121 | 120 | mount --bind /mnt system |
| 122 | 121 | else |
| 123 | 122 | rm -rf * |
| @@ -155,6 +154,7 @@ echo -n Detecting Android-x86... | ||
| 155 | 154 | for c in `cat /proc/cmdline`; do |
| 156 | 155 | case $c in |
| 157 | 156 | iso-scan/filename=*) |
| 157 | + SRC=iso | |
| 158 | 158 | eval `echo $c | cut -b1-3,18-` |
| 159 | 159 | ;; |
| 160 | 160 | *) |
