Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/core

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)

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)