mirror of
https://github.com/pi-hole/docker-pi-hole.git
synced 2025-12-20 02:18:51 +00:00
rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
@@ -1,2 +0,0 @@
|
|||||||
#!/command/execlineb
|
|
||||||
background { bash -e /usr/local/bin/_gravityonboot.sh }
|
|
||||||
2
src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up
Executable file
2
src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/up
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
#!/command/execlineb
|
||||||
|
background { bash -e /usr/local/bin/_postFTL.sh }
|
||||||
@@ -1 +0,0 @@
|
|||||||
_uid-gid-changer
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
# This script contains function calls and lines that may rely on pihole-FTL to be running, it is run as part of a oneshot service on container startup
|
||||||
|
|
||||||
if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
|
if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
|
||||||
set -x ;
|
set -x ;
|
||||||
@@ -21,3 +22,12 @@ if [ -z "$SKIPGRAVITYONBOOT" ] || [ ! -f "${gravityDBfile}" ]; then
|
|||||||
else
|
else
|
||||||
echo " Skipping Gravity Database Update."
|
echo " Skipping Gravity Database Update."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Run update checker to check for newer container, and display version output
|
||||||
|
echo ""
|
||||||
|
pihole updatechecker
|
||||||
|
pihole -v
|
||||||
|
|
||||||
|
DOCKER_TAG=$(cat /pihole.docker.tag)
|
||||||
|
echo " Container tag is: ${DOCKER_TAG}"
|
||||||
|
echo ""
|
||||||
@@ -69,9 +69,6 @@ test_configs
|
|||||||
echo " [i] Docker start setup complete"
|
echo " [i] Docker start setup complete"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
pihole -v
|
|
||||||
|
|
||||||
echo " Container tag is: ${PIHOLE_DOCKER_TAG}"
|
|
||||||
echo ""
|
|
||||||
echo " [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}"
|
echo " [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}"
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
@@ -100,9 +100,6 @@ ensure_basic_configuration() {
|
|||||||
chown pihole:root "${PI_HOLE_BIN_DIR}/pihole"
|
chown pihole:root "${PI_HOLE_BIN_DIR}/pihole"
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
# Update version numbers
|
|
||||||
pihole updatechecker
|
|
||||||
pihole updatechecker remote
|
|
||||||
# Re-write all of the setupVars to ensure required ones are present (like QUERY_LOGGING)
|
# Re-write all of the setupVars to ensure required ones are present (like QUERY_LOGGING)
|
||||||
|
|
||||||
# If the setup variable file exists,
|
# If the setup variable file exists,
|
||||||
|
|||||||
Reference in New Issue
Block a user