Skip to content

Commit

Permalink
Separate whitelist entries with spaces instead of newlines.
Browse files Browse the repository at this point in the history
  • Loading branch information
WillyPillow committed Jul 29, 2020
1 parent 9d9ee6a commit 6c7360f
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions qubesadmin/tools/qvm_template_postprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,19 @@ def import_appmenus(vm, source_dir):
else:
cmd_prefix = []

# store the whitelists in VM features
# separated by spaces should be ok as there should be no spaces in the file
# name according to the FreeDesktop spec
with open(os.path.join(source_dir, 'vm-whitelisted-appmenus.list'), 'r') \
as f:
vm.features['default-whitelist'] = f.read()
vm.features['default-whitelist'] = ' '.join([x.rstrip() for x in f])
with open(os.path.join(source_dir, 'whitelisted-appmenus.list'), 'r') \
as f:
vm.features['whitelist'] = f.read()
vm.features['whitelist'] = ' '.join([x.rstrip() for x in f])
with open(
os.path.join(source_dir, 'netvm-whitelisted-appmenus.list'), 'r') \
as f:
vm.features['netvm-whitelist'] = f.read()
vm.features['netvm-whitelist'] = ' '.join([x.rstrip() for x in f])

# TODO: change this to qrexec calls to GUI VM, when GUI VM will be
# implemented
Expand Down

0 comments on commit 6c7360f

Please sign in to comment.