From: Marek Lindner <marek.lindner@open-mesh.com>
Date: Thu, 10 Nov 2016 14:52:50 +0000 (+0100)
Subject: base-files: Prefer busybox arp over /proc/net/arp alias
X-Git-Tag: v17.01.0-rc1~890
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9978a3e2ca5f57a3eb53d3960b24afada03914b4;p=openwrt%2Fstaging%2Fchunkeey.git

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@open-mesh.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---

diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile
index f241ab2ef3..0118e25ff6 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" ] || {