修訂 | d09ddcc9718db4635f9fd44e2e609a0e85bae233 (tree) |
---|---|
時間 | 2017-09-10 14:39:50 |
作者 | Chih-Wei Huang <cw_huang@asus...> |
Commiter | Chih-Wei Huang |
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.
@@ -3,7 +3,7 @@ | ||
3 | 3 | # By Chih-Wei Huang <cwhuang@linux.org.tw> |
4 | 4 | # and Thorsten Glaser <tg@mirbsd.org> |
5 | 5 | # |
6 | -# Last updated 2017/07/17 | |
6 | +# Last updated 2017/09/04 | |
7 | 7 | # |
8 | 8 | # License: GNU Public License |
9 | 9 | # We explicitely grant the right to use the scripts |
@@ -93,8 +93,11 @@ check_root() | ||
93 | 93 | return 1 |
94 | 94 | fi |
95 | 95 | 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 | |
98 | 101 | elif [ -e /mnt/$SRC/system.img ]; then |
99 | 102 | remount_rw |
100 | 103 | mount -o loop,noatime /mnt/$SRC/system.img system |