Skip to content

Only consider global DNS servers if they exist #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 1 commit into from
May 11, 2026
Merged

Only consider global DNS servers if they exist #651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions network/qubes-setup-dnat-to-ns
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ def get_dns_resolved():
) or error.startswith('org.freedesktop.systemd1.'):
return get_dns_resolv_conf()
raise
# Use global entries first
dns.sort(key=lambda x: x[0] != 0)
# Only keep IPv4 entries. systemd-resolved is trusted to return valid
# addresses.
# ToDo: We only need abridged IPv4 DNS entries for ifindex == 0.
# to ensure static DNS of disconnected network interfaces are not added.
return [IPv4Address(bytes(addr)) for ifindex, family, addr in dns
if family == 2]
dns = [entry for entry in dns if entry[1] == 2]
# Use global entries only if they exist. Otherwise fall back to
# interface-specific DNS entries.
if any(ifindex == 0 for ifindex, family, addr in dns):
dns = [entry for entry in dns if entry[0] == 0]
return [IPv4Address(bytes(addr)) for ifindex, family, addr in dns]

def install_firewall_rules(dns):
qdb = qubesdb.QubesDB()
Expand Down