bootable/newinstaller
| Revisión | 3119e2fd42a1c5eacd57217675262ff033966dd7 (tree) |
|---|---|
| Tiempo | 2020-05-12 23:55:22 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
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.
initrd/init (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. |
| @@ -178,8 +176,8 @@ if [ -n "$INSTALL" ]; then | ||
| 178 | 176 | zcat /src/install.img | ( cd /; cpio -iud > /dev/null ) |
| 179 | 177 | fi |
| 180 | 178 | |
| 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 . | |
| 183 | 181 | sed -i 's|\( PATH.*\)|\1:/bin|' init.environ.rc |
| 184 | 182 | rm /sbin/modprobe |
| 185 | 183 | busybox mv /sbin/* sbin |
Fork