From 8be74249df342c78cb0226dfd3733f64911a0d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 21 May 2021 21:03:36 +0200 Subject: [PATCH] Guard qvm-start-daemon with generic 'guivm' or 'audiovm' services Not a flavor-specific one (guivm-gui-agent). QubesOS/qubes-issues#4186 --- doc/manpages/qvm-start-daemon.rst | 4 ++-- qubesadmin/tools/qvm_start_daemon.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/manpages/qvm-start-daemon.rst b/doc/manpages/qvm-start-daemon.rst index f8413b9..43a58cb 100644 --- a/doc/manpages/qvm-start-daemon.rst +++ b/doc/manpages/qvm-start-daemon.rst @@ -56,8 +56,8 @@ Options .. option:: --force Force running, even if this isn't GUI/Audio domain. GUI domain is a domain - with 'guivm-gui-agent' qvm-service enabled. Similarly for Audio domain it is - 'audiovm-audio-agent' qvm-service. + with 'guivm' qvm-service enabled. Similarly for Audio domain it is + 'audiovm' qvm-service. .. option:: --kde diff --git a/qubesadmin/tools/qvm_start_daemon.py b/qubesadmin/tools/qvm_start_daemon.py index 62f6ae1..8f77111 100644 --- a/qubesadmin/tools/qvm_start_daemon.py +++ b/qubesadmin/tools/qvm_start_daemon.py @@ -710,12 +710,12 @@ parser.add_argument('--kde', action='store_true', # Add it for the help only parser.add_argument('--force', action='store_true', default=False, help='Force running daemon without enabled services' - ' \'guivm-gui-agent\' or \'audiovm-audio-agent\'') + ' \'guivm\' or \'audiovm\'') def main(args=None): """ Main function of qvm-start-daemon tool""" - only_if_service_enabled = ['guivm-gui-agent', 'audiovm-audio-agent'] + only_if_service_enabled = ['guivm', 'audiovm'] enabled_services = [service for service in only_if_service_enabled if os.path.exists('/var/run/qubes-service/%s' % service)] if not enabled_services and '--force' not in sys.argv and \