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

Revisiona1e54494eb9acb2d467432f93ca5c206cd6aebff (tree)
Time2020-05-13 14:25:11
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

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.
@@ -140,6 +138,7 @@ debug_shell()
140138 if [ -x system/bin/sh ]; then
141139 echo Running MirBSD Korn Shell...
142140 USER="($1)" system/bin/sh -l 2>&1
141+ [ $? -ne 0 ] && /bin/sh 2>&1
143142 else
144143 echo Running busybox ash...
145144 sh 2>&1
@@ -181,8 +180,8 @@ if [ -n "$INSTALL" ]; then
181180 zcat /src/install.img | ( cd /; cpio -iud > /dev/null )
182181 fi
183182
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 .
186185 sed -i 's|\( PATH.*\)|\1:/bin|' init.environ.rc
187186 rm /sbin/modprobe
188187 busybox mv /sbin/* sbin
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -352,6 +352,9 @@ try_upgrade()
352352 prev=hd/$choice
353353 if [ -d "$prev" ]; then
354354 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
355358 rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
356359 [ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
357360 fi