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

dom0: Include default whitelisted-appmenus.list in template (#266)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-07-05 21:20:43 +02:00
parent 33fa170e75
commit b9e00b2189
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,8 @@ default_firewall_conf_file = "firewall.xml"
default_memory = 400 default_memory = 400
default_servicevm_vcpus = 1 default_servicevm_vcpus = 1
qubes_whitelisted_appmenus = 'whitelisted-appmenus.list'
dom0_update_check_interval = 6*3600 dom0_update_check_interval = 6*3600
# do not allow to start a new AppVM if Dom0 mem was to be less than this # do not allow to start a new AppVM if Dom0 mem was to be less than this
@ -707,6 +709,13 @@ class QubesVm(object):
raise IOError ("Error while copying {0} to {1}".\ raise IOError ("Error while copying {0} to {1}".\
format(template_priv, self.private_img)) format(template_priv, self.private_img))
if os.path.exists(source_template.dir_path + '/vm-' + qubes_whitelisted_appmenus):
if verbose:
print "--> Creating default whitelisted apps list: {0}".
format(self.dir_path + '/' + qubes_whitelisted_appmenus)
shutil.copy(source_template.dir_path + '/vm-' + qubes_whitelisted_appmenus,
self.dir_path + '/' + qubes_whitelisted_appmenus)
if self.is_updateable(): if self.is_updateable():
template_root = source_template.root_img template_root = source_template.root_img
if verbose: if verbose:
@ -1129,6 +1138,13 @@ class QubesTemplateVm(QubesVm):
format(src_template_vm.appmenus_template_templates_dir, self.appmenus_template_templates_dir) format(src_template_vm.appmenus_template_templates_dir, self.appmenus_template_templates_dir)
shutil.copytree (src_template_vm.appmenus_template_templates_dir, self.appmenus_template_templates_dir) shutil.copytree (src_template_vm.appmenus_template_templates_dir, self.appmenus_template_templates_dir)
if os.path.exists(src_template_vm.dir_path + '/vm-' + qubes_whitelisted_appmenus):
if verbose:
print "--> Copying default whitelisted apps list: {0}".
format(self.dir_path + '/vm-' + qubes_whitelisted_appmenus)
shutil.copy(src_template_vm.dir_path + '/vm-' + qubes_whitelisted_appmenus,
self.dir_path + '/vm-' + qubes_whitelisted_appmenus)
icon_path = "/usr/share/qubes/icons/template.png" icon_path = "/usr/share/qubes/icons/template.png"
if verbose: if verbose:
print "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, icon_path) print "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, icon_path)