Guard qvm-start-daemon with generic 'guivm' or 'audiovm' services

Not a flavor-specific one (guivm-gui-agent). QubesOS/qubes-issues#4186
QubesOS · May 21, 2021 · 8be7424 · 8be7424
1 parent 416532b
commit 8be7424
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -710,12 +710,12 @@ def is_watched(self, vm):
 # 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 \