From ef3261d0b46be45d8268f101c7c0b7eb763d4b6b Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 12 May 2017 15:24:05 +0200 Subject: [PATCH] net/mwan3: remove absolute path for bin files Signed-off-by: Florian Eckert --- net/mwan3/files/etc/hotplug.d/iface/15-mwan3 | 6 ------ net/mwan3/files/lib/mwan3/mwan3.sh | 12 ++++++------ net/mwan3/files/usr/libexec/rpcd/mwan3 | 6 +++--- net/mwan3/files/usr/sbin/mwan3 | 6 ------ net/mwan3/files/usr/sbin/mwan3track | 2 +- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 index a13ff83245..e3fd16cef0 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 +++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 @@ -11,12 +11,6 @@ if [ "$ACTION" == "ifup" ]; then [ -n "$DEVICE" ] || exit 3 fi -[ -x /usr/bin/ip ] || exit 4 -[ -x /usr/sbin/ipset ] || exit 5 -[ -x /usr/sbin/iptables ] || exit 6 -[ -x /usr/sbin/ip6tables ] || exit 7 -[ -x /usr/bin/logger ] || exit 8 - mwan3_set_connected_iptables config_load mwan3 diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index 561aaede6d..3798d7eb05 100644 --- a/net/mwan3/files/lib/mwan3/mwan3.sh +++ b/net/mwan3/files/lib/mwan3/mwan3.sh @@ -1,11 +1,11 @@ #!/bin/sh -IP4="/usr/bin/ip -4" -IP6="/usr/bin/ip -6" -IPS="/usr/sbin/ipset" -IPT4="/usr/sbin/iptables -t mangle -w" -IPT6="/usr/sbin/ip6tables -t mangle -w" -LOG="/usr/bin/logger -t mwan3 -p" +IP4="ip -4" +IP6="ip -6" +IPS="ipset" +IPT4="iptables -t mangle -w" +IPT6="ip6tables -t mangle -w" +LOG="logger -t mwan3 -p" CONNTRACK_FILE="/proc/net/nf_conntrack" mwan3_get_iface_id() diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3 index 2b80460689..bbc570f6c2 100755 --- a/net/mwan3/files/usr/libexec/rpcd/mwan3 +++ b/net/mwan3/files/usr/libexec/rpcd/mwan3 @@ -6,9 +6,9 @@ MWAN3_STATUS_DIR="/var/run/mwan3track" MWAN3_PID_FILE="/var/run/mwan3track" -IPS="/usr/sbin/ipset" -IPT4="/usr/sbin/iptables -t mangle -w" -IPT6="/usr/sbin/ip6tables -t mangle -w" +IPS="ipset" +IPT4="iptables -t mangle -w" +IPT6="ip6tables -t mangle -w" report_connected_v4() { local address diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index 10dc86f8f5..f23d2e71b7 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -1,11 +1,5 @@ #!/bin/sh -[ -x /usr/bin/ip ] || exit 4 -[ -x /usr/sbin/ipset ] || exit 5 -[ -x /usr/sbin/iptables ] || exit 6 -[ -x /usr/sbin/ip6tables ] || exit 7 -[ -x /usr/bin/logger ] || exit 8 - . /lib/functions.sh . /lib/functions/network.sh . /lib/mwan3/mwan3.sh diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index 58a31f0cab..8179a9e51a 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -2,7 +2,7 @@ . /lib/functions.sh -LOG="/usr/bin/logger -t $(basename "$0")[$$] -p" +LOG="logger -t $(basename "$0")[$$] -p" INTERFACE="" DEVICE="" -- 2.30.2