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

Revision3119e2fd42a1c5eacd57217675262ff033966dd7 (tree)
Time2020-05-12 23:55:22
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

init: do not keep initrd's busybox in debug mode

Keeping initrd's busybox in debug mode is an old feature before we added
busybox porting to Android-x86. But it introduced some inconsistencies
between debug and normal modes. Moreover, it depends on AOSP's tool (ln)
to work properly. In case the tool fails to run, the system may not boot.

In short, the feature does more harm than good. Let's remove it from
debug mode. Only keep it if BUSYBOX=1 is set in cmdline.

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.
@@ -178,8 +176,8 @@ if [ -n "$INSTALL" ]; then
178176 zcat /src/install.img | ( cd /; cpio -iud > /dev/null )
179177 fi
180178
181-if [ -x system/bin/ln -a \( -n "$DEBUG" -o -n "$BUSYBOX" \) ]; then
182- mv /bin /lib .
179+if [ -x system/bin/ln -a -n "$BUSYBOX" ]; then
180+ mv -f /bin /lib .
183181 sed -i 's|\( PATH.*\)|\1:/bin|' init.environ.rc
184182 rm /sbin/modprobe
185183 busybox mv /sbin/* sbin