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

Redo "core: do not reset firewal when setting netvm=none"

Browse Source 
Apparently it got lost in merge.

QubesOS/qubes-issues#862
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-07 01:09:30 +01:00 committed by Wojtek Porczyk
parent 736773dbec
commit 3e3213e7c7
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/vm/mix/net.py
View File

@ -278,18 +278,7 @@ class NetVMMixin(object):
# if hasattr(self.netvm, 'post_vm_net_detach'):
# self.netvm.post_vm_net_detach(self)
if new_netvm is None:
# if not self._do_not_reset_firewall:
# Set also firewall to block all traffic as discussed in #370
if os.path.exists(self.firewall_conf):
shutil.copy(self.firewall_conf,
os.path.join(qubes.config.system_path['qubes_base_dir'],
'backup',
'%s-firewall-%s.xml' % (self.name,
time.strftime('%Y-%m-%d-%H:%M:%S'))))
self.write_firewall_conf({'allow': False, 'allowDns': False,
'allowIcmp': False, 'allowYumProxy': False, 'rules': []})
else:
if new_netvm is not None:
new_netvm.connected_vms.add(self)
if new_netvm is None: