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

dom0/core: include net/proxy VM default appmenus list in cloned template

Browse Source
This commit is contained in:
Marek Marczykowski 2012-10-03 21:12:18 +02:00
parent 9a90f499bc
commit 45639096fa
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1624,12 +1624,13 @@ class QubesTemplateVm(QubesVm):
super(QubesTemplateVm, self).clone_disk_files(src_vm=src_vm, verbose=verbose) super(QubesTemplateVm, self).clone_disk_files(src_vm=src_vm, verbose=verbose)
if os.path.exists(src_vm.dir_path + '/vm-' + qubes_whitelisted_appmenus): for whitelist in ['/vm-' + qubes_whitelisted_appmenus, '/netvm-' + qubes_whitelisted_appmenus]:
if os.path.exists(src_vm.dir_path + whitelist):
if verbose: if verbose:
print >> sys.stderr, "--> Copying default whitelisted apps list: {0}".\ print >> sys.stderr, "--> Copying default whitelisted apps list: {0}".\
format(self.dir_path + '/vm-' + qubes_whitelisted_appmenus) format(self.dir_path + whitelist)
shutil.copy(src_vm.dir_path + '/vm-' + qubes_whitelisted_appmenus, shutil.copy(src_vm.dir_path + whitelist,
self.dir_path + '/vm-' + qubes_whitelisted_appmenus) self.dir_path + whitelist)
if verbose: if verbose:
print >> sys.stderr, "--> Copying the template's clean volatile image:\n{0} ==>\n{1}".\ print >> sys.stderr, "--> Copying the template's clean volatile image:\n{0} ==>\n{1}".\