From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.lab.pengutronix.de) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jeZyW-0002nc-6m for ptxdist@pengutronix.de; Fri, 29 May 2020 10:02:44 +0200 Received: from mol by dude02.lab.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jeZyV-0006kp-Ut for ptxdist@pengutronix.de; Fri, 29 May 2020 10:02:43 +0200 Date: Fri, 29 May 2020 10:02:43 +0200 From: Michael Olbrich Message-ID: <20200529080243.GC31789@pengutronix.de> References: <20191206103613.GB2137842@lenoch> <20200106105956.GD5858@pengutronix.de> <20200513103910.GA5308@lenoch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200513103910.GA5308@lenoch> Subject: Re: [ptxdist] [PATCH] openvpn: allow use of iproute2 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de On Wed, May 13, 2020 at 12:39:10PM +0200, Ladislav Michl wrote: > 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? I looked into the code and I didn't see anything that busybox ip cannot handle. So please keep it simple and drop the fallback. Michael > --- 8< --- > > From: Ladislav Michl > 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 > --- > 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 > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de