From 73176a87cdb805a877081f0edd09ad9ee69736f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Tue, 25 Dec 2018 18:30:19 +0100 Subject: [PATCH] gluon-ebtables-limit-arp: set and use PATH for batctl and ebtables binary path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this patch the batctl wrapper is used to determine the correct batctl binary either for batman-adv or batman-adv-legacy. Signed-off-by: Linus Lüssing --- .../files/etc/init.d/gluon-arp-limiter | 1 + package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/gluon-ebtables-limit-arp/files/etc/init.d/gluon-arp-limiter b/package/gluon-ebtables-limit-arp/files/etc/init.d/gluon-arp-limiter index 553b4e20..06034397 100755 --- a/package/gluon-ebtables-limit-arp/files/etc/init.d/gluon-arp-limiter +++ b/package/gluon-ebtables-limit-arp/files/etc/init.d/gluon-arp-limiter @@ -9,6 +9,7 @@ start_service() { procd_set_param command /usr/sbin/gluon-arp-limiter procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} + procd_set_param env PATH=/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin procd_set_param stderr 1 procd_close_instance } diff --git a/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c b/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c index 9c764006..e5a39c95 100644 --- a/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c +++ b/package/gluon-ebtables-limit-arp/src/gluon-arp-limiter.c @@ -16,9 +16,9 @@ #include "gluon-arp-limiter.h" #include "mac.h" -#define BATCTL_DC "/usr/sbin/batctl dc -H -n" -#define BATCTL_TL "/usr/sbin/batctl tl -H -n" -#define EBTABLES "/usr/sbin/ebtables-tiny" +#define BATCTL_DC "batctl dc -H -n" +#define BATCTL_TL "batctl tl -H -n" +#define EBTABLES "ebtables-tiny" #define BUILD_BUG_ON(check) ((void)sizeof(int[1-2*!!(check)]))