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

core: fix QubesVm.clone_attrs - really copy dicts

Browse Source 
Otherwise it would point at the same object and for example changing
vm.services[] in one VM will change that also for another. That link
will be severed after reloading the VMs from qubes.xml, but at least in
case of DispVM startup its too late - vm.service['qubes-dvm'] is set for
the DispVM template even during normal startup, not savefile preparation.
This commit is contained in:
Marek Marczykowski-Górecki 2015-04-10 18:30:15 +02:00
parent d776400973
commit 913cc27023
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core-modules/000QubesVm.py
View File

@ -1210,7 +1210,10 @@ class QubesVm(object):
self._do_not_reset_firewall = True self._do_not_reset_firewall = True
for prop in self.get_clone_attrs(): for prop in self.get_clone_attrs():
try: try:
setattr(self, prop, getattr(src_vm, prop)) val = getattr(src_vm, prop)
if isinstance(val, dict):
val = val.copy()
setattr(self, prop, val)
except Exception as e: except Exception as e:
if fail_on_error: if fail_on_error:
self._do_not_reset_firewall = False self._do_not_reset_firewall = False