Merge pull request #1245 from orazioedoardo/default-no

Default VPN protocols to unsupported (workaround for issue #1239)
This commit is contained in:
Orazio 2021-02-12 10:58:12 +01:00 committed by GitHub
commit 8d2a800851
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -439,8 +439,10 @@ preconfigurePackages(){
BASE_DEPS+=(dhcpcd5) BASE_DEPS+=(dhcpcd5)
fi fi
AVAILABLE_OPENVPN="$(apt-cache policy openvpn | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}')"
DPKG_ARCH="$(dpkg --print-architecture)" DPKG_ARCH="$(dpkg --print-architecture)"
AVAILABLE_OPENVPN="$(apt-cache policy openvpn | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}')"
OPENVPN_SUPPORT=0
NEED_OPENVPN_REPO=0 NEED_OPENVPN_REPO=0
# We require OpenVPN 2.4 or later for ECC support. If not available in the # We require OpenVPN 2.4 or later for ECC support. If not available in the
@ -462,6 +464,7 @@ preconfigurePackages(){
fi fi
AVAILABLE_WIREGUARD="$(apt-cache policy wireguard | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}')" AVAILABLE_WIREGUARD="$(apt-cache policy wireguard | grep -m1 'Candidate: ' | grep -v '(none)' | awk '{print $2}')"
WIREGUARD_SUPPORT=0
# If a wireguard kernel object is found and is part of any installed package, then # If a wireguard kernel object is found and is part of any installed package, then
# it has not been build via DKMS or manually (installing via wireguard-dkms does not # it has not been build via DKMS or manually (installing via wireguard-dkms does not