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

Fix and improvements from Marek's comments

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-11-27 23:38:02 +01:00
parent 0e049e682a
commit f7fa577c47
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ install:
install -d $(DESTDIR)/etc/xdg/autostart install -d $(DESTDIR)/etc/xdg/autostart
install -m 0644 etc/qvm-start-daemon.desktop $(DESTDIR)/etc/xdg/autostart/ install -m 0644 etc/qvm-start-daemon.desktop $(DESTDIR)/etc/xdg/autostart/
install -d $(DESTDIR)/usr/bin install -d $(DESTDIR)/usr/bin
ln -sf /usr/bin/qubes-start-daemon $(DESTDIR)/usr/bin/qubes-start-gui ln -sf qvm-start-daemon $(DESTDIR)/usr/bin/qvm-start-gui
clean: clean:
rm -rf test-packages/__pycache__ qubesadmin/__pycache__ rm -rf test-packages/__pycache__ qubesadmin/__pycache__

5
doc/manpages/qvm-start-daemon.rst
View File

@ -3,6 +3,11 @@
:program:`qvm-start-daemon` -- start GUI/AUDIO for qube(s) :program:`qvm-start-daemon` -- start GUI/AUDIO for qube(s)
========================================================= =========================================================
.. note::
`qvm-start-gui` has been renamed to `qvm-start-daemon` as it handles now
`gui` and `audio`.
.. warning:: .. warning::
This page was autogenerated from command-line parser. It shouldn't be 1:1 This page was autogenerated from command-line parser. It shouldn't be 1:1

1
doc/manpages/qvm-start-gui.rst Symbolic link
View File

@ -0,0 +1 @@
qvm-start-daemon.rst

29
qubesadmin/tools/qvm_start_daemon.py
View File

@ -409,23 +409,18 @@ class DAEMONLauncher:
for vm in self.app.domains: for vm in self.app.domains:
if vm.klass == 'AdminVM': if vm.klass == 'AdminVM':
continue continue
if getattr(vm, 'guivm', None) == vm.app.local_name:
if vm.features.check_with_template('gui', True): power_state = vm.get_power_state()
power_state = vm.get_power_state() if power_state == 'Running':
if power_state == 'Running': asyncio.ensure_future(
asyncio.ensure_future( self.start_gui(vm, monitor_layout=monitor_layout))
self.start_gui(vm, monitor_layout=monitor_layout)) asyncio.ensure_future(self.start_audio(vm))
elif power_state == 'Transient': elif power_state == 'Transient':
# it is still starting, we'll get 'domain-start' # it is still starting, we'll get 'domain-start'
# event when fully started # event when fully started
if vm.virt_mode == 'hvm': if vm.virt_mode == 'hvm':
asyncio.ensure_future( asyncio.ensure_future(
self.start_gui_for_stubdomain(vm)) self.start_gui_for_stubdomain(vm))
if getattr(vm, 'audiovm', None) == vm.app.local_name:
if vm.features.check_with_template('audio', True):
power_state = vm.get_power_state()
if power_state == 'Running':
asyncio.ensure_future(self.start_audio(vm))
def register_events(self, events): def register_events(self, events):
"""Register domain startup events in app.events dispatcher""" """Register domain startup events in app.events dispatcher"""