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

services: fixes from Marek's comments

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2020-03-08 09:51:30 +01:00
parent 31c098d1bd
commit bdc3c6588b
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/ext/services.py
View File

@ -31,7 +31,7 @@ class ServicesExtension(qubes.ext.Extension):
""" """
@staticmethod @staticmethod
def add_dom0_services(vm, service): def add_dom0_service(vm, service):
try: try:
os.makedirs( os.makedirs(
qubes.config.system_path['dom0_services_dir'], exist_ok=True) qubes.config.system_path['dom0_services_dir'], exist_ok=True)
@ -44,7 +44,7 @@ class ServicesExtension(qubes.ext.Extension):
qubes.config.system_path['dom0_services_dir'])) qubes.config.system_path['dom0_services_dir']))
@staticmethod @staticmethod
def remove_dom0_services(vm, service): def remove_dom0_service(vm, service):
try: try:
service = '{}/{}'.format( service = '{}/{}'.format(
qubes.config.system_path['dom0_services_dir'], service) qubes.config.system_path['dom0_services_dir'], service)
@ -99,7 +99,7 @@ class ServicesExtension(qubes.ext.Extension):
str(int(bool(value)))) str(int(bool(value))))
if vm.name == "dom0" and str(int(bool(value))) == "1": if vm.name == "dom0" and str(int(bool(value))) == "1":
self.add_dom0_services(vm, service) self.add_dom0_service(vm, service)
@qubes.ext.handler('domain-feature-delete:*') @qubes.ext.handler('domain-feature-delete:*')
def on_domain_feature_delete(self, vm, event, feature): def on_domain_feature_delete(self, vm, event, feature):
@ -116,7 +116,7 @@ class ServicesExtension(qubes.ext.Extension):
vm.untrusted_qdb.rm('/qubes-service/{}'.format(service)) vm.untrusted_qdb.rm('/qubes-service/{}'.format(service))
if vm.name == "dom0": if vm.name == "dom0":
self.remove_dom0_services(vm, service) self.remove_dom0_service(vm, service)
@qubes.ext.handler('domain-load') @qubes.ext.handler('domain-load')
def on_domain_load(self, vm, event): def on_domain_load(self, vm, event):
@ -134,9 +134,8 @@ class ServicesExtension(qubes.ext.Extension):
if not feature.startswith('service.'): if not feature.startswith('service.'):
continue continue
service = feature[len('service.'):] service = feature[len('service.'):]
if str(int(bool(value))) == "1" and not os.path.exists( if str(int(bool(value))) == "1":
'/var/run/qubes-service/{}'.format(service)): self.add_dom0_service(vm, service)
os.mknod('/var/run/qubes-service/{}'.format(service))
@qubes.ext.handler('features-request') @qubes.ext.handler('features-request')
def supported_services(self, vm, event, untrusted_features): def supported_services(self, vm, event, untrusted_features):