Merge dev > FTLDNS fix merge conflicts

Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2018-04-13 17:01:54 +01:00
commit 310d33b8ee
No known key found for this signature in database
GPG key ID: F5410858022DA5EB
9 changed files with 34 additions and 68 deletions

2
pihole
View file

@ -475,7 +475,7 @@ statusFunc() {
local addnConfigs
# Determine if service is running on port 53 (Cr: https://superuser.com/a/806331)
if (echo > /dev/tcp/localhost/53) >/dev/null 2>&1; then
if (echo > /dev/tcp/127.0.0.1/53) >/dev/null 2>&1; then
if [[ "${1}" != "web" ]]; then
echo -e " ${TICK} DNS service is running"
fi