mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-15 10:43:55 +00:00
Remove glitchy daemon detection.
This commit is contained in:
parent
36285ead57
commit
f9570a82cc
1 changed files with 2 additions and 6 deletions
|
@ -211,19 +211,15 @@ daemon_check() {
|
||||||
local found_daemon=false
|
local found_daemon=false
|
||||||
local lsof_value
|
local lsof_value
|
||||||
|
|
||||||
|
|
||||||
if [[ ${IPV6_ENABLED} ]]; then
|
if [[ ${IPV6_ENABLED} ]]; then
|
||||||
lsof_value=$(lsof -i 6:${2} -FcL | tr '\n' ' ') \
|
lsof_value=$(lsof -i 6:${2} -FcL | tr '\n' ' ') \
|
||||||
&& (log_echo "Port ${2} is in use on IPv6" && (lsof_parse "${lsof_value}" "${1}" && found_daemon=true)) \
|
&& (log_echo "Port ${2} is in use on IPv6" && lsof_parse "${lsof_value}" "${1}") \
|
||||||
|| (log_echo "Port ${2} is not in use on IPv6.")
|
|| (log_echo "Port ${2} is not in use on IPv6.")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
lsof_value=$(lsof -i 4:${2} -FcL | tr '\n' ' ') \
|
lsof_value=$(lsof -i 4:${2} -FcL | tr '\n' ' ') \
|
||||||
&& (log_echo "Port ${2} is in use on IPv4" && (lsof_parse "${lsof_value}" "${1}" && found_daemon=true)) \
|
&& (log_echo "Port ${2} is in use on IPv4" && lsof_parse "${lsof_value}" "${1}") \
|
||||||
|| (log_echo "Port ${2} is not in use on IPv4.")
|
|| (log_echo "Port ${2} is not in use on IPv4.")
|
||||||
if [[ "${found_daemon}" == false ]]; then
|
|
||||||
log_echo "Missing required daemon ${1}, please check configuration."
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
testResolver() {
|
testResolver() {
|
||||||
|
|
Loading…
Reference in a new issue