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

qubes/vm: fix handling autostart set/reset

Browse Source 
1. Service symlink must have ".service" extension
2. Disable service on property reset to default
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-09 03:02:42 +02:00
parent 5b4e30524a
commit 3f6c96ee39
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/vm/qubesvm.py
View File

@ -569,7 +569,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
["sudo", "ln", "-sf", ["sudo", "ln", "-sf",
"/usr/lib/systemd/system/qubes-vm@.service", "/usr/lib/systemd/system/qubes-vm@.service",
"/etc/systemd/system/multi-user.target.wants/qubes-vm@{" "/etc/systemd/system/multi-user.target.wants/qubes-vm@{"
"}".format(self.name)]) "}.service".format(self.name)])
else: else:
retcode = subprocess.call( retcode = subprocess.call(
['sudo', 'systemctl', 'disable', ['sudo', 'systemctl', 'disable',
@ -578,6 +578,17 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
raise qubes.exc.QubesException( raise qubes.exc.QubesException(
'Failed to set autostart for VM in systemd') 'Failed to set autostart for VM in systemd')
@qubes.events.handler('property-pre-del:autostart')
def on_property_pre_del_autostart(self, event, prop, oldvalue=None):
# pylint: disable=unused-argument
if oldvalue:
retcode = subprocess.call(
['sudo', 'systemctl', 'disable',
'qubes-vm@{}.service'.format(self.name)])
if retcode:
raise qubes.exc.QubesException(
'Failed to reset autostart for VM in systemd')
@qubes.events.handler('device-pre-attach:pci') @qubes.events.handler('device-pre-attach:pci')
def on_device_pre_attached_pci(self, event, device): def on_device_pre_attached_pci(self, event, device):
# pylint: disable=unused-argument # pylint: disable=unused-argument