Remove Unneccessary kill -9
Since piholeFTL test properly spins down it's no longer necessary to kill it. He's dead Jim Merge #300, added `piholeFTL test` to the startup sequence to replace dnsmasq as a dependency for validate_env and gravity.sh. kill -9 was kept as a work around to a standing issue that `piholeFTL test` didn't spin down on it's own. This was fixed in pi-hole/FTL#1067, landed on Apr 14 2021 and confirmed working, as evinced by #834 which was filed the same day it that fix landed. Signed-off-by: D.Rect <48034372+DistractionRectangle@users.noreply.github.com>
This commit is contained in:
parent
ba9d2e54bf
commit
408f71a480
|
@ -7,8 +7,6 @@ if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
|
|||
bashCmd='bash -e -x'
|
||||
fi
|
||||
|
||||
# used to start dnsmasq here for gravity to use...now that conflicts port 53
|
||||
|
||||
$bashCmd /start.sh
|
||||
# Gotta go fast, no time for gravity
|
||||
if [ -n "$PYTEST" ]; then
|
||||
|
@ -26,7 +24,4 @@ else
|
|||
[ ! -e /etc/cron.d/gravity-on-boot ] || rm /etc/cron.d/gravity-on-boot &>/dev/null
|
||||
fi
|
||||
|
||||
# Kill dnsmasq because s6 won't like it if it's running when s6 services start
|
||||
kill -9 $(pgrep pihole-FTL) || true # TODO: REVISIT THIS SO AS TO NOT kill -9
|
||||
|
||||
pihole -v
|
||||
|
|
Loading…
Reference in New Issue