Generate qubes-guid options based on features #144
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pwmarcz
force-pushed
the
guid-conf
branch
3 times, most recently
from
228fe85 to
17bd6e3
Compare
marmarek
requested changes
Jun 27, 2020
qubesadmin/tools/qvm_start_daemon.py
Outdated
| @@ -262,14 +365,32 @@ def common_guid_args(self, vm): | |||
| if vm.features.check_with_template('rpc-clipboard', False): | |||
| guid_cmd.extend(['-Q']) | |||
|
|
|||
| guivm = self.app.domains[self.app.local_name] | |||
There was a problem hiding this comment.
This should be rather vm.guivm. In practice it is the same value (gui-daemon is started only if vm.guivm is local), but it will be clearer this way.
Allow configuring options per VM or globally per GuiVM. The qvm-start-daemon program reads the options from VM features, and generates a configuration file for qubes-guid. Requires QubesOS/qubes-gui-daemon#47 (customizing the configuration file).
Done. |
marmarek
approved these changes
Jul 8, 2020
OpenQA test summaryComplete test suite and dependencies: https://openqa.qubes-os.org/tests/10655#dependencies Failed tests
New failuresCompared to: https://openqa.qubes-os.org/tests/9500#dependencies
Fixed failuresCompared to: https://openqa.qubes-os.org/tests/9500#dependencies
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow configuring options per VM or globally per GuiVM. The
qvm-start-daemon program reads the options from VM features, and
generates a configuration file for qubes-guid.
Requires QubesOS/qubes-gui-daemon#47 (customizing the configuration
file).