summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaeung Song <treeze.taeung@gmail.com>2018-07-10 02:51:21 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-24 13:07:06 +0200
commitab85798979f1f470d64227628ed581fa0d341bfe (patch)
tree6eabccf1cf3df0235a6ca54e205a006a1aeea82b
parent276dbd6801de8445807021704a5fb19e25d57dc4 (diff)
samples/bpf: Fix tc and ip paths in xdp2skb_meta.sh
[ Upstream commit b9626f45abccd044f8048269c67720f0719f2d4e ] The below path error can occur: # ./xdp2skb_meta.sh --dev eth0 --list ./xdp2skb_meta.sh: line 61: /usr/sbin/tc: No such file or directory So just use command names instead of absolute paths of tc and ip. In addition, it allow callers to redefine $TC and $IP paths Fixes: 36e04a2d78d9 ("samples/bpf: xdp2skb_meta shows transferring info from XDP to SKB") Reviewed-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Taeung Song <treeze.taeung@gmail.com> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rwxr-xr-xsamples/bpf/xdp2skb_meta.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/samples/bpf/xdp2skb_meta.sh b/samples/bpf/xdp2skb_meta.sh
index b9c9549c4c27..4bde9d066c46 100755
--- a/samples/bpf/xdp2skb_meta.sh
+++ b/samples/bpf/xdp2skb_meta.sh
@@ -16,8 +16,8 @@
BPF_FILE=xdp2skb_meta_kern.o
DIR=$(dirname $0)
-export TC=/usr/sbin/tc
-export IP=/usr/sbin/ip
+[ -z "$TC" ] && TC=tc
+[ -z "$IP" ] && IP=ip
function usage() {
echo ""
@@ -53,7 +53,7 @@ function _call_cmd() {
local allow_fail="$2"
shift 2
if [[ -n "$VERBOSE" ]]; then
- echo "$(basename $cmd) $@"
+ echo "$cmd $@"
fi
if [[ -n "$DRYRUN" ]]; then
return