mirror of
https://github.com/itdoginfo/podkop.git
synced 2026-01-27 04:40:37 +03:00
fix: Disable dnsmasq noresolv when restoring or using default resolvfile; ensure resolvfile is applied
This commit is contained in:
@@ -400,7 +400,6 @@ dnsmasq_restore() {
|
|||||||
log "Restoring noresolv" "debug"
|
log "Restoring noresolv" "debug"
|
||||||
noresolv="$(uci_get "dhcp" "@dnsmasq[0]" "podkop_noresolv")"
|
noresolv="$(uci_get "dhcp" "@dnsmasq[0]" "podkop_noresolv")"
|
||||||
if [ -z "$noresolv" ]; then
|
if [ -z "$noresolv" ]; then
|
||||||
uci_remove "dhcp" "@dnsmasq[0]" "noresolv"
|
|
||||||
uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
|
uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
|
||||||
else
|
else
|
||||||
uci_set "dhcp" "@dnsmasq[0]" "noresolv" "$noresolv"
|
uci_set "dhcp" "@dnsmasq[0]" "noresolv" "$noresolv"
|
||||||
@@ -419,6 +418,10 @@ dnsmasq_restore() {
|
|||||||
elif file_exists "$resolvfile"; then
|
elif file_exists "$resolvfile"; then
|
||||||
log "Backup DNS servers not found, using default resolvfile" "debug"
|
log "Backup DNS servers not found, using default resolvfile" "debug"
|
||||||
uci_set "dhcp" "@dnsmasq[0]" "resolvfile" "$resolvfile"
|
uci_set "dhcp" "@dnsmasq[0]" "resolvfile" "$resolvfile"
|
||||||
|
if [ -n "$noresolv" ] && [ "$noresolv" -eq 1 ]; then
|
||||||
|
log "Disabling noresolv option to use system resolvfile" "debug"
|
||||||
|
uci_set "dhcp" "@dnsmasq[0]" "noresolv" 0
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
log "Backup DNS servers and default resolvfile not found, possible resolving issues" "warn"
|
log "Backup DNS servers and default resolvfile not found, possible resolving issues" "warn"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user