From bce7b64d4acc97814dc697f8798e5f425b9519b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 7 Oct 2017 02:36:02 +0200 Subject: [PATCH] Fix calling qubes.SuspendPre/qubes.SuspendPost services Those should be called as root, not default user. Thanks @jpouellet for debugging this. Fixes QubesOS/qubes-issues#3151 Fixes QubesOS/qubes-issues#3142 --- qubes/vm/qubesvm.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index c2c660e0..0a4845cb 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -945,7 +945,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): raise qubes.exc.QubesVMNotRunningError(self) if list(self.devices['pci'].attached()): - yield from self.run_service_for_stdio('qubes.SuspendPre') + yield from self.run_service_for_stdio('qubes.SuspendPre', + user='root') self.libvirt_domain.pMSuspendForDuration( libvirt.VIR_NODE_SUSPEND_TARGET_MEM, 0, 0) else: @@ -975,7 +976,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): # pylint: disable=not-an-iterable if self.get_power_state() == "Suspended": self.libvirt_domain.pMWakeup() - yield from self.run_service_for_stdio('qubes.SuspendPost') + yield from self.run_service_for_stdio('qubes.SuspendPost', + user='root') else: yield from self.unpause()