1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00

Merge pull request #2502 from pi-hole/release/v4.1

Release/v4.1 backports to development
This commit is contained in:
Dan Schaper 2018-11-09 12:49:32 -08:00 committed by GitHub
commit 1f596eb2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -617,7 +617,7 @@ chooseInterface() {
# See https://github.com/pi-hole/pi-hole/issues/1473#issuecomment-301745953 # See https://github.com/pi-hole/pi-hole/issues/1473#issuecomment-301745953
testIPv6() { testIPv6() {
# first will contain fda2 (ULA) # first will contain fda2 (ULA)
printf -v first "%d" "${1%%:*}" printf -v first "%s" "${1%%:*}"
# value1 will contain 253 which is the decimal value corresponding to 0xfd # value1 will contain 253 which is the decimal value corresponding to 0xfd
value1=$(( (0x$first)/256 )) value1=$(( (0x$first)/256 ))
# will contain 162 which is the decimal value corresponding to 0xa2 # will contain 162 which is the decimal value corresponding to 0xa2
@ -1132,7 +1132,7 @@ chooseBlocklists() {
# For each choice available, # For each choice available,
for choice in ${choices} for choice in ${choices}
do do
appendToListsFile choice appendToListsFile "${choice}"
done done
} }