mirror of
https://github.com/ben-grande/qusal.git
synced 2025-02-18 22:04:08 -05:00
fix: shutdown template before install state
Template was not set to shutdown after patch to avoid double the amount of startups at shutdown required due to the salt patch that a package needs to be installed during the "create" state. Proven to cause problems in case a qube based on the same template requires a package that is installed during the "install" state. Other fedora-minimal templates "mgmt" and "sys-pgp" are unaffected. Fixes: https://github.com/ben-grande/qusal/issues/70
This commit is contained in:
parent
15711c912f
commit
620fa10a69
@ -106,3 +106,14 @@ features:
|
|||||||
- name: salt-patch.sh
|
- name: salt-patch.sh
|
||||||
- source: salt://fedora-minimal/files/admin/bin/salt-patch.sh
|
- source: salt://fedora-minimal/files/admin/bin/salt-patch.sh
|
||||||
- args: tpl-{{ slsdotpath }}
|
- args: tpl-{{ slsdotpath }}
|
||||||
|
|
||||||
|
## TODO: Remove when template with patch reaches upstream or updates enforce
|
||||||
|
## salt-deps to be installed.
|
||||||
|
## https://github.com/QubesOS/qubes-issues/issues/8806
|
||||||
|
"{{ slsdotpath }}-shutdown-template":
|
||||||
|
qvm.shutdown:
|
||||||
|
- require:
|
||||||
|
- qvm: "{{ slsdotpath }}-set-management_dispvm-to-default"
|
||||||
|
- name: tpl-{{ slsdotpath }}
|
||||||
|
- flags:
|
||||||
|
- force
|
||||||
|
@ -4,6 +4,10 @@ SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
|
|||||||
SPDX-License-Identifier: AGPL-3.0-or-later
|
SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
#}
|
#}
|
||||||
|
|
||||||
|
## TODO: Remove when template with patch reaches upstream or updates enforce
|
||||||
|
## salt-deps to be installed.
|
||||||
|
## https://github.com/QubesOS/qubes-issues/issues/8806
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- .create
|
- .create
|
||||||
|
|
||||||
@ -14,14 +18,3 @@ include:
|
|||||||
- name: tpl-{{ slsdotpath }}
|
- name: tpl-{{ slsdotpath }}
|
||||||
- prefs:
|
- prefs:
|
||||||
- management_dispvm: "*default*"
|
- management_dispvm: "*default*"
|
||||||
|
|
||||||
## TODO: Remove when template with patch reaches upstream or updates enforce
|
|
||||||
## salt-deps to be installed.
|
|
||||||
## https://github.com/QubesOS/qubes-issues/issues/8806
|
|
||||||
"{{ slsdotpath }}-shutdown-template":
|
|
||||||
qvm.shutdown:
|
|
||||||
- require:
|
|
||||||
- qvm: "{{ slsdotpath }}-set-management_dispvm-to-default"
|
|
||||||
- name: tpl-{{ slsdotpath }}
|
|
||||||
- flags:
|
|
||||||
- force
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user