|
|
@ -1224,8 +1224,7 @@ installScripts() {
|
|
|
|
# Install the configs from PI_HOLE_LOCAL_REPO to their various locations
|
|
|
|
# Install the configs from PI_HOLE_LOCAL_REPO to their various locations
|
|
|
|
installConfigs() {
|
|
|
|
installConfigs() {
|
|
|
|
printf "\\n %b Installing configs from %s...\\n" "${INFO}" "${PI_HOLE_LOCAL_REPO}"
|
|
|
|
printf "\\n %b Installing configs from %s...\\n" "${INFO}" "${PI_HOLE_LOCAL_REPO}"
|
|
|
|
# Make sure Pi-hole's config files are in place
|
|
|
|
|
|
|
|
remove_old_dnsmasq_ftl_configs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Install list of DNS servers
|
|
|
|
# Install list of DNS servers
|
|
|
|
# Format: Name;Primary IPv4;Secondary IPv4;Primary IPv6;Secondary IPv6
|
|
|
|
# Format: Name;Primary IPv4;Secondary IPv4;Primary IPv6;Secondary IPv6
|
|
|
@ -1695,6 +1694,8 @@ installPihole() {
|
|
|
|
exit 1
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
remove_old_dnsmasq_ftl_configs
|
|
|
|
|
|
|
|
|
|
|
|
# Install config files
|
|
|
|
# Install config files
|
|
|
|
if ! installConfigs; then
|
|
|
|
if ! installConfigs; then
|
|
|
|
printf " %b Failure in dependent config copy function.\\n" "${CROSS}"
|
|
|
|
printf " %b Failure in dependent config copy function.\\n" "${CROSS}"
|
|
|
|