Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

bootable-newinstaller: Commit

bootable/newinstaller


Commit MetaInfo

Revision603f82f0b65d1cb01b440e7129a8575f23674e24 (tree)
Time2019-12-03 11:42:25
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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

Change Summary

Incremental Difference

--- a/initrd/init
+++ b/initrd/init
@@ -96,7 +96,6 @@ check_root()
9696 mount --move /mnt /iso
9797 mkdir /mnt/iso
9898 mount -o loop /iso/$iso /mnt/iso
99- SRC=iso
10099 fi
101100 if [ -e /mnt/$SRC/$RAMDISK ]; then
102101 zcat /mnt/$SRC/$RAMDISK | cpio -id > /dev/null
@@ -117,7 +116,7 @@ check_root()
117116 elif [ -d /mnt/$SRC/system ]; then
118117 remount_rw
119118 mount --bind /mnt/$SRC/system system
120- elif [ -e /mnt/build.prop ]; then
119+ elif [ -z "$SRC" -a -e /mnt/build.prop ]; then
121120 mount --bind /mnt system
122121 else
123122 rm -rf *
@@ -155,6 +154,7 @@ echo -n Detecting Android-x86...
155154 for c in `cat /proc/cmdline`; do
156155 case $c in
157156 iso-scan/filename=*)
157+ SRC=iso
158158 eval `echo $c | cut -b1-3,18-`
159159 ;;
160160 *)
Show on old repository browser