diff options
Diffstat (limited to 'sys-apps/busybox/files/busybox-1.26.2-bb.patch')
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.26.2-bb.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/sys-apps/busybox/files/busybox-1.26.2-bb.patch b/sys-apps/busybox/files/busybox-1.26.2-bb.patch new file mode 100644 index 00000000..5e2405c3 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.26.2-bb.patch @@ -0,0 +1,55 @@ +add `bb` and `bbsh` shortcuts as aliases to the main shell so we can install +symlinks in Gentoo at /bin/bb as our recovery shell. + +we also add fallbacks to /bin/busybox and /bin/busybox.static in case /proc +is not yet mounted during early boot. + +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -144,6 +144,8 @@ + //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) + //applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) + //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) ++//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) ++//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) + + //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o + //kbuild:lib-$(CONFIG_SH_IS_ASH) += ash.o ash_ptr_hack.o shell_common.o +@@ -7572,6 +7574,8 @@ + } + /* re-exec ourselves with the new arguments */ + execve(bb_busybox_exec_path, argv, envp); ++ execve("/bin/busybox.static", argv, envp); ++ execve("/bin/busybox", argv, envp); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + } +--- a/shell/hush.c ++++ b/shell/hush.c +@@ -221,6 +221,8 @@ + //applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) + //applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) + //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) ++//applet:IF_HUSH(APPLET_ODDNAME(bb, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) ++//applet:IF_HUSH(APPLET_ODDNAME(bbsh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) + + //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o + //kbuild:lib-$(CONFIG_SH_IS_HUSH) += hush.o match.o shell_common.o +@@ -6073,6 +6075,8 @@ + if (SPECIAL_JOBSTOP_SIGS != 0) + switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS); + execve(bb_busybox_exec_path, argv, pp); ++ execve("/bin/busybox.static", argv, pp); ++ execve("/bin/busybox", argv, pp); + /* Fallback. Useful for init=/bin/hush usage etc */ + if (argv[0][0] == '/') + execve(argv[0], argv, pp); +@@ -6931,6 +6931,8 @@ + if (SPECIAL_JOBSTOP_SIGS != 0) + switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS); + execv(bb_busybox_exec_path, argv); ++ execv("/bin/busybox.static", argv); ++ execv("/bin/busybox", argv); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + } |