Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-19 11:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for builtin WireGuard module

Browse source 
in which case there is no dedicated file in /lib/modules. A rare case but possible.

Additionally the recursive globbing has been replaced by dpkg-query's internal recursive asterisk matching, which performs better/faster. This does now also match on "wireguard.kosomething", but I think "wireguard" is specific enough and dots in kernel modules names uncommon, to no be an issue.

Signed-off-by: MichaIng <micha@dietpi.com>
This commit is contained in:
MichaIng 2022-06-10 15:15:25 +02:00 committed by GitHub
parent e809d5bd32
commit d861de2918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
auto_install/install.sh
View file

@ -93,9 +93,6 @@ c=$(( c < 70 ? 70 : c ))
# Override localization settings so the output is in English language. # Override localization settings so the output is in English language.
export LC_ALL=C export LC_ALL=C
# Enable recursive globbing to find wireguard.ko in /lib/modules.
shopt -s globstar
main(){ main(){
# Pre install checks and configs # Pre install checks and configs
rootCheck rootCheck
@ -492,12 +489,9 @@ preconfigurePackages(){
# and not part of the .deb). # and not part of the .deb).
# Source: https://github.com/MichaIng/DietPi/blob/7bf5e1041f3b2972d7827c48215069d1c90eee07/dietpi/dietpi-software#L1807-L1815 # Source: https://github.com/MichaIng/DietPi/blob/7bf5e1041f3b2972d7827c48215069d1c90eee07/dietpi/dietpi-software#L1807-L1815
WIREGUARD_BUILTIN=0 WIREGUARD_BUILTIN=0
for i in /lib/modules/**/wireguard.ko{,.xz}; do if dpkg-query -S '/lib/modules/*/wireguard.ko*' &> /dev/null || modinfo wireguard 2> /dev/null | grep -q '^filename:[[:blank:]]*(builtin)$'; then
[[ -f $i ]] || continue
dpkg-query -S "$i" &> /dev/null || continue
WIREGUARD_BUILTIN=1 WIREGUARD_BUILTIN=1
break fi
done
if if
# If the module is builtin and the package available, we only need to install wireguard-tools. # If the module is builtin and the package available, we only need to install wireguard-tools.