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:
Adam Warner 2022-11-09 17:51:07 +00:00
parent 1f69a1ab83
commit f73c92d03b
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173
10 changed files with 13 additions and 10 deletions

View File

@ -1,2 +0,0 @@
#!/command/execlineb
background { bash -e /usr/local/bin/_gravityonboot.sh }

View File

@ -0,0 +1,2 @@
#!/command/execlineb
background { bash -e /usr/local/bin/_postFTL.sh }

View File

@ -1 +0,0 @@
_uid-gid-changer

View File

@ -1,4 +1,5 @@
#!/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
set -x ;
@ -20,4 +21,13 @@ if [ -z "$SKIPGRAVITYONBOOT" ] || [ ! -f "${gravityDBfile}" ]; then
pihole -g
else
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 ""

View File

@ -69,9 +69,6 @@ test_configs
echo " [i] Docker start setup complete"
echo ""
pihole -v
echo " Container tag is: ${PIHOLE_DOCKER_TAG}"
echo ""
echo " [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}"
echo ""

View File

@ -100,9 +100,6 @@ ensure_basic_configuration() {
chown pihole:root "${PI_HOLE_BIN_DIR}/pihole"
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)
# If the setup variable file exists,