Re: [ptxdist] [PATCH] openvpn: allow use of iproute2

[Ladislav Michl <ladis@linux-mips.org>]

On Mon, Jan 06, 2020 at 11:59:56AM +0100, Michael Olbrich wrote:
> On Fri, Dec 06, 2019 at 11:36:13AM +0100, Ladislav Michl wrote:
> > Let OpenVPN use ip command when BUSYBOX_IP is not selected. This
> > allows OpenVPN to be used in Busybox-less environments.
> 
> Hmmm, what does the -{en,dis}able-iproute2 option do exactly?
> Could we enable it unconditionally or does BUSYBOX_IP not provide all the
> necessary features?

Well, what about using 'ip' by default and legacy interface as a fallback?

--- 8< ---

From: Ladislav Michl <ladis@linux-mips.org>
Subject: [PATCH] openvpn: select IPROUTE2 without BUSYBOX only

OpenVPN can be configured to use 'ip' command by specifying
--enable-iproute2, otherwise legacy net-tools commands 'ifconfig'
and 'route' are used.

Use (rt)netlink interface provided by 'ip' tool by default with
fallback to legacy one. This allows OpenVPN package to be used
in Busybox-less environments without requiring legacy net-tools.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/openvpn.in   | 15 ++++++++++-----
 rules/openvpn.make |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/rules/openvpn.in b/rules/openvpn.in
index 6958e2940..37bf36cf4 100644
--- a/rules/openvpn.in
+++ b/rules/openvpn.in
@@ -9,11 +9,12 @@ menuconfig OPENVPN
 	select IPTABLES			if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
 	select IPTABLES_INSTALL_TOOLS	if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME
 	select BRIDGE_UTILS		if OPENVPN_INSTALL_SAMPLE_SCRIPTS && RUNTIME
-	select IPROUTE2			if !BUSYBOX_IP && RUNTIME
-	select IPROUTE2_IP		if !BUSYBOX_IP && RUNTIME
-	select BUSYBOX_IFCONFIG		if RUNTIME
-	select BUSYBOX_NETSTAT		if RUNTIME
-	select BUSYBOX_ROUTE		if RUNTIME
+	select IPROUTE2			if !BUSYBOX && RUNTIME
+	select IPROUTE2_IP		if !BUSYBOX && RUNTIME
+	select BUSYBOX_IFCONFIG		if BUSYBOX && !BUSYBOX_IP && RUNTIME
+	select BUSYBOX_ROUTE		if BUSYBOX && !BUSYBOX_IP && RUNTIME
+	select BUSYBOX_FEATURE_IP_LINK	if BUSYBOX && BUSYBOX_IP && RUNTIME
+	select BUSYBOX_FEATURE_IP_ROUTE	if BUSYBOX && BUSYBOX_IP && RUNTIME
 	help
 	  virtual private network daemon
 
@@ -35,6 +36,10 @@ menuconfig OPENVPN
 
 if OPENVPN
 
+config OPENVPN_IPROUTE2
+	bool
+	default BUSYBOX_IP || IPROUTE2_IP
+
 config OPENVPN_SMALL
 	bool
 	prompt "Enable smaller executable size"
diff --git a/rules/openvpn.make b/rules/openvpn.make
index dc05384df..0c4f99ff2 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -67,7 +67,7 @@ OPENVPN_CONF_OPT	:= \
 	--enable-port-share \
 	--disable-debug \
 	--$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \
-	--disable-iproute2 \
+	--$(call ptx/endis, PTXCONF_OPENVPN_IPROUTE2)-iproute2 \
 	--enable-def-auth \
 	--enable-pf \
 	--disable-plugin-auth-pam \
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de