a63eb74bce
busybox currently installs traceroute and traceroute6 into /usr/bin which prevents their 'full' iputils variants from being installed. Move those applets to /bin so they can coexist with their iputils siblings using the same PATH convention already applied for coreutils and other drop-in 'full' versions. Refresh existing patch while at it. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
14 lines
632 B
Diff
14 lines
632 B
Diff
--- a/networking/traceroute.c
|
|
+++ b/networking/traceroute.c
|
|
@@ -239,8 +239,8 @@
|
|
//config: Add option -I to use ICMP ECHO instead of UDP datagrams.
|
|
|
|
/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
|
|
-//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
|
|
-//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))
|
|
+//applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_BIN, BB_SUID_MAYBE))
|
|
+//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_BIN, BB_SUID_MAYBE))
|
|
|
|
//kbuild:lib-$(CONFIG_TRACEROUTE) += traceroute.o
|
|
//kbuild:lib-$(CONFIG_TRACEROUTE6) += traceroute.o
|