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:
parent
1f69a1ab83
commit
f73c92d03b
|
@ -1,2 +0,0 @@
|
|||
#!/command/execlineb
|
||||
background { bash -e /usr/local/bin/_gravityonboot.sh }
|
|
@ -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
|
||||
# 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 ""
|
|
@ -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 ""
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue