ohnobinki_overlay Files · sys-apps/busybox/files/busybox-1.18.0-bb.patch

Files @ 0fd306d51f35

Branch filter:

Location: ohnobinki_overlay/sys-apps/busybox/files/busybox-1.18.0-bb.patch

0fd306d51f35 918 B text/x-diff Show Annotation Show as Raw Download as Raw

binki

sys-apps/busybox: Import busybox-1.18.1 from portage.

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

--- a/shell/ash.c
+++ b/shell/ash.c
@@ -75,6 +75,8 @@
 //applet:IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP))
 //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, _BB_DIR_BIN, _BB_SUID_DROP, sh))
 //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash))
+//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_ASH_RANDOM_SUPPORT) += random.o
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7255,6 +7255,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 */
 	}