Skip to content

Keep AppVM boot modes and template AppVM default boot mode in sync #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 1 commit into from
Mar 10, 2025
Merged

Keep AppVM boot modes and template AppVM default boot mode in sync #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions qubes/vm/qubesvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,9 +1204,7 @@ def on_domain_init_loaded(self, event):
self._domain_stopped_event_handled = False

@qubes.events.handler("domain-feature-set:boot-mode.active")
def on_feature_bootmode_active_set(
self, event, feature, value, oldvalue=None
):
def on_feature_bootmode_set(self, event, feature, value, oldvalue=None):
# pylint: disable=unused-argument
if value == oldvalue:
return
Expand Down
23 changes: 23 additions & 0 deletions qubes/vm/templatevm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,29 @@ def on_feature_bootmode_appvm_set(
if appvm.property_is_default("bootmode"):
appvm.fire_event("property-reset:bootmode", name="bootmode")

@qubes.events.handler(
"property-set:appvm_default_bootmode",
)
def on_property_bootmode_appvm_set(
self, event, name, newvalue, oldvalue=None
):
# pylint: disable=unused-argument
if newvalue == oldvalue:
return
for appvm in getattr(self, "appvms", []):
if appvm.property_is_default("bootmode"):
appvm.fire_event("property-reset:bootmode", name="bootmode")

# pylint: disable=invalid-name
@qubes.events.handler(
"property-reset:appvm_default_bootmode",
)
def on_property_bootmode_appvm_reset(self, event, name, oldvalue=None):

@marmarek marmarek Mar 9, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pylint says too long name, but IMO it fits, just add ignore comment

# pylint: disable=unused-argument
for appvm in getattr(self, "appvms", []):
if appvm.property_is_default("bootmode"):
appvm.fire_event("property-reset:bootmode", name="bootmode")

@qubes.events.handler(
"property-set:default_user",
"property-set:kernel",
Expand Down