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

Invalidate $IPv4Addr and $IPv4gw when the user claims those settings are not correct

Browse source
This commit is contained in:
Orazio 2020-01-26 14:47:31 +01:00
parent b12996df37
commit e0ee6cf937
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
auto_install/install.sh
View file

@ -60,7 +60,7 @@ r=$(( r < 20 ? 20 : r ))
c=$(( c < 70 ? 70 : c )) c=$(( c < 70 ? 70 : c ))
# Find IP (with netmask) and gateway used to route to outside world # Find IP (with netmask) and gateway used to route to outside world
BaseIPv4addr=$(ip route get 192.0.2.1| awk '{print $7}') BaseIPv4addr=$(ip route get 192.0.2.1 | awk '{print $7}')
CurrentIPv4addr=$(ip -o -f inet address | grep "${BaseIPv4addr}/" | awk '{print $4}') CurrentIPv4addr=$(ip -o -f inet address | grep "${BaseIPv4addr}/" | awk '{print $4}')
CurrentIPv4gw=$(ip route get 192.0.2.1 | awk '{print $3}') CurrentIPv4gw=$(ip route get 192.0.2.1 | awk '{print $3}')
@ -786,6 +786,8 @@ It is also possible to use a DHCP reservation, but if you are going to do that,
else else
# If the settings are wrong, the loop continues # If the settings are wrong, the loop continues
ipSettingsCorrect=False ipSettingsCorrect=False
IPv4AddrValid=False
IPv4gwValid=False
fi fi
done done
# End the if statement for DHCP vs. static # End the if statement for DHCP vs. static
@ -1062,6 +1064,8 @@ installOpenVPN(){
} }
installWireGuard(){ installWireGuard(){
local PIVPN_DEPS
if [ "$PLAT" = "Raspbian" ]; then if [ "$PLAT" = "Raspbian" ]; then
# If this Raspberry Pi uses armv7l we can use the package from the repo # If this Raspberry Pi uses armv7l we can use the package from the repo