Android-x86
Fork
捐款

  • R/O
  • HTTP
  • SSH
  • HTTPS

bootable-newinstaller: 提交

bootable/newinstaller


Commit MetaInfo

修訂d09ddcc9718db4635f9fd44e2e609a0e85bae233 (tree)
時間2017-09-10 14:39:50
作者Chih-Wei Huang <cw_huang@asus...>
CommiterChih-Wei Huang

Log Message

init: support new system.sfs

In oreo-x86 system.sfs is built by mksquashfsimage.sh. It contains
the system image directly. The older system.sfs is still supported
for compatibility.

Change Summary

差異

--- a/initrd/init
+++ b/initrd/init
@@ -3,7 +3,7 @@
33 # By Chih-Wei Huang <cwhuang@linux.org.tw>
44 # and Thorsten Glaser <tg@mirbsd.org>
55 #
6-# Last updated 2017/07/17
6+# Last updated 2017/09/04
77 #
88 # License: GNU Public License
99 # We explicitely grant the right to use the scripts
@@ -93,8 +93,11 @@ check_root()
9393 return 1
9494 fi
9595 if [ -e /mnt/$SRC/system.sfs ]; then
96- mount -o loop,noatime /mnt/$SRC/system.sfs /sfs
97- mount -o loop,noatime /sfs/system.img system
96+ mount -o loop,noatime /mnt/$SRC/system.sfs system
97+ if [ -e system/system.img ]; then
98+ mount --move system /sfs
99+ mount -o loop,noatime /sfs/system.img system
100+ fi
98101 elif [ -e /mnt/$SRC/system.img ]; then
99102 remount_rw
100103 mount -o loop,noatime /mnt/$SRC/system.img system
Show on old repository browser