Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-03-14 22:44:04 +01:00
commit f83daa49f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom0/qvm-core/qubes.py
View File

@ -1431,7 +1431,7 @@ class QubesAppVm(QubesCowVm):
return True return True
def get_firewall_conf(self): def get_firewall_conf(self):
conf = { "rules": list() } conf = { "rules": list(), "allow": True, "allowDns": True }
try: try:
tree = xml.etree.ElementTree.parse(self.firewall_conf) tree = xml.etree.ElementTree.parse(self.firewall_conf)

4
dom0/qvm-tools/qvm-dom0-network-via-netvm
View File

@ -31,6 +31,8 @@ def get_netvm():
qvm_collection.load() qvm_collection.load()
qvm_collection.unlock_db() qvm_collection.unlock_db()
netvm = qvm_collection.get_default_netvm_vm() 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': if netvm is None or netvm.name == 'dom0':
print 'There seems to be no dedicated default netvm, aborting.' print 'There seems to be no dedicated default netvm, aborting.'
sys.exit(1) sys.exit(1)
@ -98,4 +100,4 @@ def main():
usage() usage()
main() main()