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

Remove CIDR from IPv6 address when detecting it in the install script

Browse source 
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/basic-install.sh
This commit is contained in:
Adam Warner 2017-06-28 22:54:02 +01:00
parent 9464b71a6e
commit edb594461d
No known key found for this signature in database
GPG key ID: 03843F6C65554B22
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
automated install/basic-install.sh
View file

@ -344,8 +344,8 @@ useIPv6dialog() {
# Determine type of found IPv6 addresses # Determine type of found IPv6 addresses
for i in "${IPV6_ADDRESSES[@]}"; do for i in "${IPV6_ADDRESSES[@]}"; do
result=$(testIPv6 "$i") result=$(testIPv6 "$i")
[[ "${result}" == "ULA" ]] && ULA_ADDRESS="$i" [[ "${result}" == "ULA" ]] && ULA_ADDRESS="${i%/*}"
[[ "${result}" == "GUA" ]] && GUA_ADDRESS="$i" [[ "${result}" == "GUA" ]] && GUA_ADDRESS="${i%/*}"
done done
# Determine which address to be used: Prefer ULA over GUA or don't use any if none found # Determine which address to be used: Prefer ULA over GUA or don't use any if none found
@ -1510,7 +1510,6 @@ main() {
else else
echo "::: Update complete!" echo "::: Update complete!"
fi fi
if [[ ${INSTALL_WEB} == true ]]; then if [[ ${INSTALL_WEB} == true ]]; then
if (( ${#pw} > 0 )) ; then if (( ${#pw} > 0 )) ; then
echo ":::" echo ":::"
@ -1524,7 +1523,8 @@ main() {
fi fi
echo ":::" echo ":::"
echo "::: The install log is located at: /etc/pihole/install.log" echo "::: The install log is located at: /etc/pihole/install.log
"
} }
if [[ "${PH_TEST}" != true ]] ; then if [[ "${PH_TEST}" != true ]] ; then