Compare commits
3 Commits
v6.0.4
...
fix/migrat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f0dd363c99 | ||
|
|
6cb8f55215 | ||
|
|
4f268ed193 |
@@ -2326,6 +2326,25 @@ migrate_dnsmasq_configs() {
|
|||||||
|
|
||||||
mv /etc/dnsmasq.d/0{1,2,4,5}-pihole*.conf "${V6_CONF_MIGRATION_DIR}/" 2>/dev/null || true
|
mv /etc/dnsmasq.d/0{1,2,4,5}-pihole*.conf "${V6_CONF_MIGRATION_DIR}/" 2>/dev/null || true
|
||||||
mv /etc/dnsmasq.d/06-rfc6761.conf "${V6_CONF_MIGRATION_DIR}/" 2>/dev/null || true
|
mv /etc/dnsmasq.d/06-rfc6761.conf "${V6_CONF_MIGRATION_DIR}/" 2>/dev/null || true
|
||||||
|
|
||||||
|
# Finally, after everything is in place, we can create the new config file
|
||||||
|
# /etc/pihole/pihole.toml
|
||||||
|
# This file will be created with the default settings unless the user has
|
||||||
|
# changed settings via setupVars.conf or the other dnsmasq files moved above
|
||||||
|
str="Migrating Pi-hole configuration to version 6"
|
||||||
|
printf " %b %s...\\n" "${INFO}"
|
||||||
|
local FTLoutput FTLstatus
|
||||||
|
FTLoutput=$(pihole-FTL migrate v6)
|
||||||
|
FTLstatus=$?
|
||||||
|
if [[ "${FTLstatus}" -eq 0 ]]; then
|
||||||
|
printf " %b %s\\n" "${TICK}" "${str}"
|
||||||
|
else
|
||||||
|
printf " %b %s\\n" "${CROSS}" "${str}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Print the output of the FTL migration prefacing every line with four
|
||||||
|
# spaces for alignment
|
||||||
|
printf "%b" "${FTLoutput}" | sed 's/^/ /'
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
|
|||||||
Reference in New Issue
Block a user