[source] base-files: Prefer busybox arp over /proc/net/arp alias

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 10 07:12:56 PST 2016


jow pushed a commit to source.git, branch master:
https://git.lede-project.org/9978a3e2ca5f57a3eb53d3960b24afada03914b4

commit 9978a3e2ca5f57a3eb53d3960b24afada03914b4
Author: Marek Lindner <marek.lindner at open-mesh.com>
AuthorDate: Thu Nov 10 15:52:50 2016 +0100

    base-files: Prefer busybox arp over /proc/net/arp alias
    
    A firmware compiled with BUSYBOX_CONFIG_ARP should also use by default the
    arp binary from busybox. Otherwise the extra functionality the user
    requested can only be used when running arp with the path to the binary.
    
    Signed-off-by: Marek Lindner <marek.lindner at open-mesh.com>
    Signed-off-by: Sven Eckelmann <sven.eckelmann at open-mesh.com>
---
 package/base-files/files/etc/profile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile
index f241ab2..0118e25 100644
--- a/package/base-files/files/etc/profile
+++ b/package/base-files/files/etc/profile
@@ -20,7 +20,7 @@ alias ll='ls -alF --color=auto'
 
 [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
 
-[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
+[ -x /usr/bin/arp -o -x /sbin/arp ] || arp() { cat /proc/net/arp; }
 [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
 
 [ -n "$FAILSAFE" ] || {



More information about the lede-commits mailing list