commit
8d57c8ce7b
|
@ -2,7 +2,7 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
bashCmd='bash -e'
|
bashCmd='bash -e'
|
||||||
if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
|
if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
|
||||||
set -x ;
|
set -x ;
|
||||||
bashCmd='bash -e -x'
|
bashCmd='bash -e -x'
|
||||||
fi
|
fi
|
||||||
|
@ -11,8 +11,8 @@ fi
|
||||||
|
|
||||||
$bashCmd /start.sh
|
$bashCmd /start.sh
|
||||||
# Gotta go fast, no time for gravity
|
# Gotta go fast, no time for gravity
|
||||||
if [ -n "$PYTEST" ]; then
|
if [ -n "$PYTEST" ]; then
|
||||||
sed -i 's/^gravity_spinup$/#gravity_spinup # DISABLED FOR PYTEST/g' "$(which gravity.sh)"
|
sed -i 's/^gravity_spinup$/#gravity_spinup # DISABLED FOR PYTEST/g' "$(which gravity.sh)"
|
||||||
fi
|
fi
|
||||||
if [ -z "$SKIPGRAVITYONBOOT" ]; then
|
if [ -z "$SKIPGRAVITYONBOOT" ]; then
|
||||||
gravity.sh
|
gravity.sh
|
||||||
|
@ -21,6 +21,6 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Kill dnsmasq because s6 won't like it if it's running when s6 services start
|
# Kill dnsmasq because s6 won't like it if it's running when s6 services start
|
||||||
kill -9 $(pgrep pihole-FTL) || true
|
kill -9 $(pgrep pihole-FTL) || true # TODO: REVISIT THIS SO AS TO NOT kill -9
|
||||||
|
|
||||||
pihole -v
|
pihole -v
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
s6-echo "Stopping pihole-FTL"
|
s6-echo "Stopping pihole-FTL"
|
||||||
kill -9 $(pgrep pihole-FTL)
|
kill -9 $(pgrep pihole-FTL) # TODO: REVISIT THIS SO AS TO NOT kill -9
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
s6-echo "Starting pihole-FTL ($FTL_CMD) as ${DNSMASQ_USER}"
|
s6-echo "Starting pihole-FTL ($FTL_CMD) as ${DNSMASQ_USER}"
|
||||||
|
# Remove possible leftovers from previous pihole-FTL processes
|
||||||
|
rm -f /dev/shm/FTL-* 2> /dev/null
|
||||||
|
rm /run/pihole/FTL.sock 2> /dev/null
|
||||||
s6-setuidgid ${DNSMASQ_USER} pihole-FTL $FTL_CMD >/dev/null 2>&1
|
s6-setuidgid ${DNSMASQ_USER} pihole-FTL $FTL_CMD >/dev/null 2>&1
|
||||||
|
|
||||||
# Notes on above:
|
# Notes on above:
|
||||||
|
|
Loading…
Reference in New Issue