Merge pull request pi-hole#2725 from pi-hole/fix/get-ip-similar-subnets

AzureMarker · web-flow · commit b27e4c3dc3cd · 2019-04-28T14:24:47.000-04:00
Fix getting IP address in the presence of similar subnets
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
@@ -525,7 +525,7 @@ find_IPv4_information() {
     fi
 
     # Append the CIDR notation to the IP address, if valid_ip fails this should return 127.0.0.1/8
-    IPV4_ADDRESS=$(ip -oneline -family inet address show | grep "${IPv4bare}" |  awk '{print $4}' | awk 'END {print}')
+    IPV4_ADDRESS=$(ip -oneline -family inet address show | grep "${IPv4bare}/" |  awk '{print $4}' | awk 'END {print}')
 }
 
 # Get available interfaces that are UP

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ find_IPv4_information() {`
`525`	`525`	`fi`
`526`	`526`
`527`	`527`	`# Append the CIDR notation to the IP address, if valid_ip fails this should return 127.0.0.1/8`
`528`		`- IPV4_ADDRESS=$(ip -oneline -family inet address show \| grep "${IPv4bare}" \| awk '{print $4}' \| awk 'END {print}')`
	`528`	`+ IPV4_ADDRESS=$(ip -oneline -family inet address show \| grep "${IPv4bare}/" \| awk '{print $4}' \| awk 'END {print}')`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`# Get available interfaces that are UP`