bootable/newinstaller
Revision | a1e54494eb9acb2d467432f93ca5c206cd6aebff (tree) |
---|---|
Time | 2020-05-13 14:25:11 |
Author | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
@@ -3,8 +3,6 @@ | ||
3 | 3 | # By Chih-Wei Huang <cwhuang@linux.org.tw> |
4 | 4 | # and Thorsten Glaser <tg@mirbsd.org> |
5 | 5 | # |
6 | -# Last updated 2018/01/26 | |
7 | -# | |
8 | 6 | # License: GNU Public License |
9 | 7 | # We explicitely grant the right to use the scripts |
10 | 8 | # with Android-x86 project. |
@@ -140,6 +138,7 @@ debug_shell() | ||
140 | 138 | if [ -x system/bin/sh ]; then |
141 | 139 | echo Running MirBSD Korn Shell... |
142 | 140 | USER="($1)" system/bin/sh -l 2>&1 |
141 | + [ $? -ne 0 ] && /bin/sh 2>&1 | |
143 | 142 | else |
144 | 143 | echo Running busybox ash... |
145 | 144 | sh 2>&1 |
@@ -181,8 +180,8 @@ if [ -n "$INSTALL" ]; then | ||
181 | 180 | zcat /src/install.img | ( cd /; cpio -iud > /dev/null ) |
182 | 181 | fi |
183 | 182 | |
184 | -if [ -x system/bin/ln -a \( -n "$DEBUG" -o -n "$BUSYBOX" \) ]; then | |
185 | - mv /bin /lib . | |
183 | +if [ -x system/bin/ln -a -n "$BUSYBOX" ]; then | |
184 | + mv -f /bin /lib . | |
186 | 185 | sed -i 's|\( PATH.*\)|\1:/bin|' init.environ.rc |
187 | 186 | rm /sbin/modprobe |
188 | 187 | busybox mv /sbin/* sbin |
@@ -352,6 +352,9 @@ try_upgrade() | ||
352 | 352 | prev=hd/$choice |
353 | 353 | if [ -d "$prev" ]; then |
354 | 354 | mv $prev $1 |
355 | + for d in `find hd -type l -maxdepth 1`; do | |
356 | + [ "`readlink $d`" = "$choice" ] && ln -sf `basename $1` $d | |
357 | + done | |
355 | 358 | rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant |
356 | 359 | [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf |
357 | 360 | fi |