Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-21 17:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Version 4.1

Browse Source 
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill
2018-12-10 21:28:53 -06:00
parent c45bf4c8dd
commit d7a125a706
11 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
s6/debian-root/etc/cont-init.d/20-start.sh
View File

@@ -10,6 +10,10 @@ 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
sed -i 's/^gravity_spinup$/#gravity_spinup # DISABLED FOR PYTEST/g' "$(which gravity.sh)"
fi
gravity.sh
# Kill dnsmasq because s6 won't like it if it's running when s6 services start