Patchwork [PATCHv2] openvpn: adjust iproute2 path logic

login
register
mail settings
Submitter Gustavo Zacarias
Date April 4, 2013, 9:32 p.m.
Message ID <1365111173-29701-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/233952/
State Accepted
Commit 1627fb54715406d6c76461d5104ee11dabbf5870
Headers show

Comments

Gustavo Zacarias - April 4, 2013, 9:32 p.m.
As reported in bug #6164 when using busybox iproute2 openvpn can fail to
locate the 'ip' utility.
This was correct until busybox 1.21.0 was released since it changed the
location of /bin/ip to /sbin/ip (what iproute2 proper does).
So adjust the ip path accordingly.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/openvpn/openvpn.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Peter Korsgaard - April 7, 2013, 7:45 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> As reported in bug #6164 when using busybox iproute2 openvpn
 Gustavo> can fail to locate the 'ip' utility.  This was correct until
 Gustavo> busybox 1.21.0 was released since it changed the location of
 Gustavo> /bin/ip to /sbin/ip (what iproute2 proper does).  So adjust
 Gustavo> the ip path accordingly.

Committed, thanks.

Patch

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index c911465..7a4385b 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -17,10 +17,14 @@  OPENVPN_CONF_OPT += --enable-small --disable-plugins \
 	--disable-debug --disable-eurephia
 endif
 
+# Busybox 1.21+ places the ip applet in the "correct" place
+# but previous versions didn't.
 ifeq ($(BR2_PACKAGE_IPROUTE2),y)
 OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
-else
+else ifeq ($(BR2_BUSYBOX_VERSION_1_19_X)$(BR2_BUSYBOX_VERSION_1_20_X),y)
 OPENVPN_CONF_ENV += IPROUTE=/bin/ip
+else
+OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
 endif
 
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)