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

qvm-start-daemon: allow starting only if service enabled

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2020-01-17 15:04:33 +01:00
parent f7fa577c47
commit 05e479cf92
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/qvm-start-daemon.desktop
View File

@ -5,4 +5,3 @@ Icon=qubes
Exec=qvm-start-daemon --all --watch Exec=qvm-start-daemon --all --watch
Terminal=false Terminal=false
Type=Application Type=Application
NotShowIn=X-QUBES

11
qubesadmin/tools/qvm_start_daemon.py
View File

@ -26,6 +26,7 @@ import subprocess
import asyncio import asyncio
import re import re
import functools import functools
import sys
import xcffib import xcffib
import xcffib.xproto # pylint: disable=unused-import import xcffib.xproto # pylint: disable=unused-import
@ -460,10 +461,20 @@ parser.add_argument('--pidfile', action='store', default=pidfile_path,
parser.add_argument('--notify-monitor-layout', action='store_true', parser.add_argument('--notify-monitor-layout', action='store_true',
help='Notify running instance in --watch mode' help='Notify running instance in --watch mode'
' about changed monitor layout') ' about changed monitor layout')
# 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\'')
def main(args=None): def main(args=None):
""" Main function of qvm-start-daemon tool""" """ Main function of qvm-start-daemon tool"""
only_if_service_enabled = ['guivm-gui-agent', 'audiovm-audio-agent']
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:
print(parser.format_help())
return
args = parser.parse_args(args) args = parser.parse_args(args)
if args.watch and not args.all_domains: if args.watch and not args.all_domains:
parser.error('--watch option must be used with --all') parser.error('--watch option must be used with --all')