From f2abc5e26ddc51c356f7751cc30ce71a9bc6ce9c Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Tue, 5 Jun 2012 20:57:40 +0200
Subject: [PATCH] dom0: populate unchanged firewall settings with previous
 values (#589)

Missed settings in new firewall configuration caused exception. In old qubes-manager (before #582 done) this exception silently broke saving operation, leaving user with progress bar windows infinitely...
---
 dom0/qvm-core/qubes.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 14aeda85..c3f71e41 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1156,6 +1156,11 @@ class QubesVm(object):
         shutil.rmtree (self.dir_path)
 
     def write_firewall_conf(self, conf):
+        defaults = self.get_firewall_conf()
+        for item in defaults.keys():
+            if item not in conf:
+                conf[item] = defaults[item]
+
         root = xml.etree.ElementTree.Element(
                 "QubesFirwallRules",
                 policy = "allow" if conf["allow"] else "deny",