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?

Michael

> Signed-off-by: Ladislav Michl <[email protected]>
> ---
>  rules/openvpn.in   | 10 +++++++---
>  rules/openvpn.make |  2 +-
>  2 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/openvpn.in b/rules/openvpn.in
> index 6958e2940..af8cf1dda 100644
> --- a/rules/openvpn.in
> +++ b/rules/openvpn.in
> @@ -11,9 +11,9 @@ menuconfig OPENVPN
>       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_IFCONFIG         if BUSYBOX_IP && RUNTIME
> +     select BUSYBOX_NETSTAT          if BUSYBOX_IP && RUNTIME
> +     select BUSYBOX_ROUTE            if BUSYBOX_IP && RUNTIME
>       help
>         virtual private network daemon
>  
> @@ -35,6 +35,10 @@ menuconfig OPENVPN
>  
>  if OPENVPN
>  
> +config OPENVPN_IPROUTE2
> +     bool
> +     default !BUSYBOX_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.24.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> [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]

Reply via email to