From 18 Jan, 2021 0:00 UTC: All services will be temporary unavailable for maintenance
  • R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

bootable/newinstaller


Commit MetaInfo

Revisiond302de58484f833699ada16a5d14351100459d04 (tree)
Time2020-05-13 18:35:52
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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

Conflicts:
initrd/init

Change Summary

Incremental Difference

--- a/initrd/init
+++ b/initrd/init
@@ -3,8 +3,6 @@
33 # By Chih-Wei Huang <cwhuang@linux.org.tw>
44 # and Thorsten Glaser <tg@mirbsd.org>
55 #
6-# Last updated 2018/01/26
7-#
86 # License: GNU Public License
97 # We explicitely grant the right to use the scripts
108 # with Android-x86 project.
@@ -131,6 +129,7 @@ debug_shell()
131129 if [ -x system/bin/sh ]; then
132130 echo Running MirBSD Korn Shell...
133131 USER="($1)" system/bin/sh -l 2>&1
132+ [ $? -ne 0 ] && /bin/sh 2>&1
134133 else
135134 echo Running busybox ash...
136135 busybox sh 2>&1
--- a/initrd/scripts/0-auto-detect
+++ b/initrd/scripts/0-auto-detect
@@ -1,6 +1,5 @@
11 #
22 # By Chih-Wei Huang <cwhuang@linux.org.tw>
3-# Last updated 2017/01/17
43 #
54 # License: GNU Public License
65 # We explicitely grant the right to use the scripts
@@ -13,7 +12,7 @@ auto_detect()
1312 tmp=/tmp/dev2mod
1413 echo 'dev2mod() { while read dev; do case $dev in' > $tmp
1514 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
1716 echo 'esac; done; }' >> $tmp
1817 for f in $(grep -Eh "drm_kms|sound.core|hyperv" /lib/modules/`uname -r`/modules.dep | cut -d. -f1); do
1918 sed -i "/$(basename $f | sed 's/-/_/g')/d" $tmp
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -353,6 +353,9 @@ try_upgrade()
353353 prev=hd/$choice
354354 if [ -d "$prev" ]; then
355355 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
356359 rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
357360 [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
358361 fi
@@ -498,6 +501,8 @@ install_to()
498501 fi
499502 fi
500503
504+ try_upgrade hd/$asrc
505+
501506 ! test -f hd/$asrc/system.img -o -d hd/$asrc/system
502507 set_answer_if_auto $?
503508 adialog --title " Question " --defaultno --yesno \
@@ -512,7 +517,7 @@ install_to()
512517 for s in `du -sk $files | awk '{print $1}'`; do
513518 size=$(($size+$s))
514519 done
515- try_upgrade hd/$asrc
520+
516521 mkdir -p hd/$asrc
517522 cd hd/$asrc
518523 rm -rf system* *.img