From c92a2bf25f4f5c0df17b8f18fe8a0c5778328ace Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Mon, 14 Mar 2011 20:43:56 +0100 Subject: [PATCH 1/2] Properly create default firewall configuration --- dom0/qvm-core/qubes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 4556c3e7..2ac48904 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -1431,7 +1431,7 @@ class QubesAppVm(QubesCowVm): return True def get_firewall_conf(self): - conf = { "rules": list() } + conf = { "rules": list(), "allow": True, "allowDns": True } try: tree = xml.etree.ElementTree.parse(self.firewall_conf) From 00ba6dd5b7441cf10f87f527f4ac7eb459cb0a08 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Mon, 14 Mar 2011 20:44:17 +0100 Subject: [PATCH 2/2] Properly find root netvm in netvm chain --- dom0/qvm-tools/qvm-dom0-network-via-netvm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dom0/qvm-tools/qvm-dom0-network-via-netvm b/dom0/qvm-tools/qvm-dom0-network-via-netvm index bf445fa2..15274211 100755 --- a/dom0/qvm-tools/qvm-dom0-network-via-netvm +++ b/dom0/qvm-tools/qvm-dom0-network-via-netvm @@ -31,6 +31,8 @@ def get_netvm(): qvm_collection.load() qvm_collection.unlock_db() netvm = qvm_collection.get_default_netvm_vm() + while netvm.netvm_vm is not None: + netvm = netvm.netvm_vm if netvm is None or netvm.name == 'dom0': print 'There seems to be no dedicated default netvm, aborting.' sys.exit(1) @@ -98,4 +100,4 @@ def main(): usage() main() - \ No newline at end of file +