Skip to content
This repository has been archived by the owner on Feb 9, 2023. It is now read-only.

Commit

Permalink
Remove Unneccessary kill -9
Browse files Browse the repository at this point in the history
Since piholeFTL test properly spins down it's no longer
necessary to kill it. He's dead Jim

Merge pi-hole#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 pi-hole#834 which was filed the same day it
that fix landed.

Signed-off-by: D.Rect <48034372+DistractionRectangle@users.noreply.github.com>
  • Loading branch information
DistractionRectangle committed Jul 25, 2021
1 parent ba9d2e5 commit 408f71a
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions s6/debian-root/etc/cont-init.d/20-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 408f71a

Please sign in to comment.