On Thu, Jun 04, 2020 at 08:32:40AM +0200, Ladislav Michl wrote: > Use (rt)netlink interface provided by 'ip' tool by default. > > Signed-off-by: Ladislav Michl <[email protected]> > --- > rules/openvpn.in | 13 +++++++------ > rules/openvpn.make | 2 +- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/rules/openvpn.in b/rules/openvpn.in > index 6958e2940..afa124e10 100644 > --- a/rules/openvpn.in > +++ b/rules/openvpn.in > @@ -9,11 +9,10 @@ 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 BUSYBOX_FEATURE_IP_LINK if BUSYBOX_IP && RUNTIME > + select BUSYBOX_FEATURE_IP_ROUTE if BUSYBOX_IP && RUNTIME > + select IPROUTE2 if !BUSYBOX && RUNTIME > + select IPROUTE2_IP if !BUSYBOX && RUNTIME
Why not just leave the !BUSYBOX_IP here? Then the comment below is not needed because either IPROUTE2_IP or IPROUTE2_IP will be selected. Michael > help > virtual private network daemon > > @@ -22,7 +21,6 @@ menuconfig OPENVPN > remote sites, make secure point-to-point connections, > enhance wireless security, etc. > > - > OpenVPN uses all of the encryption, authentication, and > certification features provided by the OpenSSL library (any > cipher, key size, or HMAC digest). > @@ -35,6 +33,9 @@ menuconfig OPENVPN > > if OPENVPN > > +comment "openvpn requires 'ip'!" > + depends on !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..46cca64ca 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 \ > + --enable-iproute2 \ > --enable-def-auth \ > --enable-pf \ > --disable-plugin-auth-pam \ > -- > 2.27.0 > > > _______________________________________________ > ptxdist mailing list > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > -- 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
