From c978ce3a485ea51d5033cfff32bafe44c6b8ba18 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 18 Jun 2012 23:51:44 +0200 Subject: [PATCH] dom0/qvm-firewall: eliminate duplicate firewall defaults definition (#599) This caused ignore of different firewall defaults for TemplateVM. --- dom0/qvm-core/qubes.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 83828819..d33cd882 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -1983,10 +1983,7 @@ class QubesProxyVm(QubesNetVm): vms = [vm for vm in self.connected_vms.values()] for vm in vms: iptables="*filter\n" - if vm.has_firewall(): - conf = vm.get_firewall_conf() - else: - conf = { "rules": list(), "allow": True, "allowDns": True, "allowIcmp": True, "allowYumProxy": False } + conf = vm.get_firewall_conf() xid = vm.get_xid() if xid < 0: # VM not active ATM