| Revision | d302de58484f833699ada16a5d14351100459d04 (tree) |
|---|---|
| Time | 2020-05-13 18:35:52 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/pie-x86' into q-x86
Conflicts:
initrd/init
initrd/init (diff) initrd/scripts/0-auto-detect (diff) install/scripts/1-install (diff)| @@ -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. |
| @@ -131,6 +129,7 @@ debug_shell() | ||
| 131 | 129 | if [ -x system/bin/sh ]; then |
| 132 | 130 | echo Running MirBSD Korn Shell... |
| 133 | 131 | USER="($1)" system/bin/sh -l 2>&1 |
| 132 | + [ $? -ne 0 ] && /bin/sh 2>&1 | |
| 134 | 133 | else |
| 135 | 134 | echo Running busybox ash... |
| 136 | 135 | busybox sh 2>&1 |
| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | # |
| 2 | 2 | # By Chih-Wei Huang <cwhuang@linux.org.tw> |
| 3 | -# Last updated 2017/01/17 | |
| 4 | 3 | # |
| 5 | 4 | # License: GNU Public License |
| 6 | 5 | # We explicitely grant the right to use the scripts |
| @@ -13,7 +12,7 @@ auto_detect() | ||
| 13 | 12 | tmp=/tmp/dev2mod |
| 14 | 13 | echo 'dev2mod() { while read dev; do case $dev in' > $tmp |
| 15 | 14 | sort -r /lib/modules/`uname -r`/modules.alias | \ |
| 16 | - sed -n 's/^alias *\([^ ]*\) *\(.*\)/\1)busybox modprobe \2;;/p' >> $tmp | |
| 15 | + sed -n 's/[()]/*/g; s/^alias *\([^ ]*\) *\(.*\)/\1)busybox modprobe \2;;/p' >> $tmp | |
| 17 | 16 | echo 'esac; done; }' >> $tmp |
| 18 | 17 | for f in $(grep -Eh "drm_kms|sound.core|hyperv" /lib/modules/`uname -r`/modules.dep | cut -d. -f1); do |
| 19 | 18 | sed -i "/$(basename $f | sed 's/-/_/g')/d" $tmp |
| @@ -353,6 +353,9 @@ try_upgrade() | ||
| 353 | 353 | prev=hd/$choice |
| 354 | 354 | if [ -d "$prev" ]; then |
| 355 | 355 | mv $prev $1 |
| 356 | + for d in `find hd -type l -maxdepth 1`; do | |
| 357 | + [ "`readlink $d`" = "$choice" ] && ln -sf `basename $1` $d | |
| 358 | + done | |
| 356 | 359 | rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant |
| 357 | 360 | [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf |
| 358 | 361 | fi |
| @@ -498,6 +501,8 @@ install_to() | ||
| 498 | 501 | fi |
| 499 | 502 | fi |
| 500 | 503 | |
| 504 | + try_upgrade hd/$asrc | |
| 505 | + | |
| 501 | 506 | ! test -f hd/$asrc/system.img -o -d hd/$asrc/system |
| 502 | 507 | set_answer_if_auto $? |
| 503 | 508 | adialog --title " Question " --defaultno --yesno \ |
| @@ -512,7 +517,7 @@ install_to() | ||
| 512 | 517 | for s in `du -sk $files | awk '{print $1}'`; do |
| 513 | 518 | size=$(($size+$s)) |
| 514 | 519 | done |
| 515 | - try_upgrade hd/$asrc | |
| 520 | + | |
| 516 | 521 | mkdir -p hd/$asrc |
| 517 | 522 | cd hd/$asrc |
| 518 | 523 | rm -rf system* *.img |
Android-x86
Fork