fix: change mgmt template to fedora

A Minimal Fedora template can't be the management qube or the targeted
qube of Salt as it is missing dependencies that are only available in
the full template. The management qube is temporarily changed to the
non-minimal version so the minimal template can be targeted once and
then it takes over the management disposable template.

Fixes: https://github.com/ben-grande/qusal/issues/28
This commit is contained in:
Ben Grande 2024-03-10 17:22:39 +01:00
parent ecbc40ff95
commit 3dca623519
5 changed files with 25 additions and 3 deletions

View File

@ -1,6 +1,6 @@
# mgmt
Management console environment in Qubes OS.
Management environment in Qubes OS.
## Table of Contents

View File

@ -1,8 +1,8 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% from 'utils/macros/clone-template.sls' import clone_template -%}
{{ clone_template('debian-minimal', sls_path) }}
{{ clone_template('fedora-minimal', sls_path) }}

View File

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{%- from "qvm/template.jinja" import load -%}
include:
- fedora.create
- .clone
{% load_yaml as defaults -%}
@ -45,3 +46,17 @@ features:
- internal
{%- endload %}
{{ load(defaults) }}
"{{ slsdotpath }}-set-management_dispvm-to-dvm-fedora":
cmd.run:
- require:
- qvm: dvm-fedora
- name: qubes-prefs management_dispvm dvm-fedora
## TODO: Remove when template with patch reaches upstream.
## https://github.com/QubesOS/qubes-issues/issues/8806
"{{ slsdotpath }}-install-":
cmd.run:
- require:
- qvm: tpl-{{ slsdotpath }}
- name: qvm-run -u root tpl-{{ slsdotpath }} -- dnf install --refresh --assumeyes --setopt=install_weak_deps=False python3-urllib3

View File

@ -6,4 +6,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
base:
'tpl-mgmt':
- match: glob
- mgmt.install

View File

@ -13,3 +13,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- name: default-mgmt-dvm
- require:
- cmd: {{ slsdotpath }}-set-management_dispvm
## TODO: Remove when template with patch reaches upstream.
## https://github.com/QubesOS/qubes-issues/issues/8806
"{{ slsdotpath }}-shutdown-template":
qvm.shutdown:
- name: tpl-{{ slsdotpath }}