ben-grande · ben-grande · Feb 24, 2025
diff --git a/docs/BOOTSTRAP.md b/docs/BOOTSTRAP.md
@@ -25,6 +25,7 @@ matter in some circumstances, in those cases, it is noted in this page.
 *   Base (order matters):
     *   [dom0](../salt/dom0/README.md)
     *   [debian-minimal](../salt/debian-minimal/README.md)
+    *   [fedora-xfce](../salt/fedora-xfce/README.md)
     *   [fedora-minimal](../salt/fedora-minimal/README.md)
     *   [mgmt](../salt/mgmt/README.md)
     *   [sys-cacher](../salt/sys-cacher/README.md)

diff --git a/salt/debian-minimal/update-admin.sls b/salt/debian-minimal/update-admin.sls
@@ -0,0 +1,20 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] == 'dom0' -%}
+
+{%- import slsdotpath ~ "/template.jinja" as template -%}
+
+include:
+  - .create
+
+"{{ slsdotpath }}-update-admin":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-vm-update --no-progress --show-output --targets={{ template.template }}
+
+{% endif %}
diff --git a/salt/debian-minimal/update-admin.top b/salt/debian-minimal/update-admin.top
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'I@qubes:type:template and E@^debian-[0-9][0-9]-minimal$':
+    - match: compound
+    - debian-minimal.update-admin
diff --git a/salt/debian-xfce/update-admin.sls b/salt/debian-xfce/update-admin.sls
@@ -0,0 +1,20 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] == 'dom0' -%}
+
+{%- import slsdotpath ~ "/template.jinja" as template -%}
+
+include:
+  - .create
+
+"{{ slsdotpath }}-update-admin":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-vm-update --no-progress --show-output --targets={{ template.template }}
+
+{% endif %}
diff --git a/salt/debian-xfce/update-admin.top b/salt/debian-xfce/update-admin.top
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'I@qubes:type:template and E@^debian-[0-9][0-9]-xfce$':
+    - match: compound
+    - debian-xfce.update-admin
diff --git a/salt/debian/update-admin.sls b/salt/debian/update-admin.sls
@@ -0,0 +1,20 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] == 'dom0' -%}
+
+{%- import slsdotpath ~ "/template.jinja" as template -%}
+
+include:
+  - .create
+
+"{{ slsdotpath }}-update-admin":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-vm-update --no-progress --show-output --targets={{ template.template }}
+
+{% endif %}
diff --git a/salt/debian/update-admin.top b/salt/debian/update-admin.top
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'I@qubes:type:template and E@^debian-[0-9][0-9]$':
+    - match: compound
+    - debian.update-admin
diff --git a/salt/fedora-minimal/README.md b/salt/fedora-minimal/README.md
@@ -19,7 +19,7 @@ it.
 
 ```sh
 sudo qubesctl top.enable fedora-minimal
-sudo qubesctl --targets=fedora-40-minimal state.apply
+sudo qubesctl --targets=fedora-41-minimal state.apply
 sudo qubesctl top.disable fedora-minimal
 sudo qubesctl state.apply fedora-minimal.prefs
 ```
@@ -30,7 +30,7 @@ sudo qubesctl state.apply fedora-minimal.prefs
 
 ```sh
 sudo qubesctl state.apply fedora-minimal.create
-sudo qubesctl --skip-dom0 --targets=fedora-40-minimal state.apply fedora-minimal.install
+sudo qubesctl --skip-dom0 --targets=fedora-41-minimal state.apply fedora-minimal.install
 sudo qubesctl state.apply fedora-minimal.prefs
 ```
 

diff --git a/salt/fedora-minimal/create.sls b/salt/fedora-minimal/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <[email protected]>
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {%- import slsdotpath ~ "/template.jinja" as template -%}
 
 include:
-  - fedora.create
+  - fedora-xfce.create
   - .clone
 
 "dvm-{{ template.template }}-absent":
@@ -23,6 +23,7 @@ name: {{ template.template }}
 force: True
 require:
 - sls: {{ template.template_clean }}.clone
+- sls: fedora-xfce.create
 present:
 - label: black
 prefs:
@@ -32,6 +33,7 @@ prefs:
 - memory: 300
 - maxmem: 600
 - include_in_backups: False
+- management_dispvm: dvm-fedora-xfce
 features:
 - set:
   - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop"
@@ -63,22 +65,3 @@ features:
   - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop"
 {%- endload %}
 {{ load(defaults) }}
-
-"{{ slsdotpath }}-set-management_dispvm-to-dvm-fedora":
-  qvm.vm:
-    - require:
-      - qvm: dvm-fedora
-    - name: {{ template.template }}
-    - prefs:
-      - management_dispvm: dvm-fedora
-
-## 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 }}-install-salt-deps":
-  cmd.script:
-    - require:
-      - qvm: "{{ slsdotpath }}-set-management_dispvm-to-dvm-fedora"
-    - name: salt-patch.sh
-    - source: salt://fedora-minimal/files/admin/bin/salt-patch.sh
-    - args: {{ template.template }}
diff --git a/salt/fedora-minimal/files/admin/bin/salt-patch.sh b/salt/fedora-minimal/files/admin/bin/salt-patch.sh
diff --git a/salt/fedora-minimal/prefs.sls b/salt/fedora-minimal/prefs.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@@ -9,21 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
   - .create
 
-"{{ slsdotpath }}-set-management_dispvm-to-default":
+"{{ slsdotpath }}-set-{{ template.template }}-management_dispvm-to-default":
   qvm.vm:
     - require:
-      - cmd: "{{ slsdotpath }}-install-salt-deps"
+      - sls: {{ slsdotpath }}.create
     - name: {{ template.template }}
     - prefs:
       - 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: {{ template.template }}
-    - flags:
-      - force
diff --git a/salt/fedora-minimal/update-admin.sls b/salt/fedora-minimal/update-admin.sls
@@ -0,0 +1,20 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] == 'dom0' -%}
+
+{%- import slsdotpath ~ "/template.jinja" as template -%}
+
+include:
+  - .create
+
+"{{ slsdotpath }}-update-admin":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-vm-update --no-progress --show-output --targets={{ template.template }}
+
+{% endif %}
diff --git a/salt/fedora-minimal/update-admin.top b/salt/fedora-minimal/update-admin.top
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'I@qubes:type:template and E@^fedora-[0-9][0-9]-minimal$':
+    - match: compound
+    - fedora-minimal.update-admin
diff --git a/salt/fedora-xfce/README.md b/salt/fedora-xfce/README.md
@@ -18,8 +18,9 @@ Creates the Fedora Xfce template as well as a Disposable Template based on it.
 
 ```sh
 sudo qubesctl top.enable fedora-xfce
-sudo qubesctl --targets=fedora-40-xfce state.apply
+sudo qubesctl --targets=fedora-41-xfce state.apply
 sudo qubesctl top.disable fedora-xfce
+sudo qubesctl state.apply fedora-xfce.prefs
 ```
 
 *   State:
@@ -28,7 +29,8 @@ sudo qubesctl top.disable fedora-xfce
 
 ```sh
 sudo qubesctl state.apply fedora-xfce.create
-sudo qubesctl --skip-dom0 --targets=fedora-40-xfce state.apply fedora-xfce.install
+sudo qubesctl --skip-dom0 --targets=fedora-41-xfce state.apply fedora-xfce.install
+sudo qubesctl state.apply fedora-xfce.prefs
 ```
 
 <!-- pkg:end:post-install -->

diff --git a/salt/fedora-xfce/create.sls b/salt/fedora-xfce/create.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <[email protected]>
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@@ -62,3 +62,11 @@ features:
   - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop"
 {%- endload %}
 {{ load(defaults) }}
+
+"{{ slsdotpath }}-set-{{ template.template }}-management_dispvm-to-dvm-{{ template.template_clean }}":
+  qvm.vm:
+    - require:
+      - qvm: dvm-{{ template.template_clean }}
+    - name: {{ template.template }}
+    - prefs:
+      - management_dispvm: "dvm-{{ template.template_clean }}"
diff --git a/salt/fedora-xfce/prefs.sls b/salt/fedora-xfce/prefs.sls
@@ -0,0 +1,18 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{%- import slsdotpath ~ "/template.jinja" as template -%}
+
+include:
+  - .create
+
+"{{ slsdotpath }}-set-{{ template.template }}-management_dispvm-to-default":
+  qvm.vm:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: {{ template.template }}
+    - prefs:
+      - management_dispvm: "*default*"
diff --git a/salt/fedora-xfce/prefs.top b/salt/fedora-xfce/prefs.top
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'dom0':
+    - match: nodegroup
+    - fedora-xfce.prefs
diff --git a/salt/fedora-xfce/update-admin.sls b/salt/fedora-xfce/update-admin.sls
@@ -0,0 +1,20 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] == 'dom0' -%}
+
+{%- import slsdotpath ~ "/template.jinja" as template -%}
+
+include:
+  - .create
+
+"{{ slsdotpath }}-update-admin":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-vm-update --no-progress --show-output --targets={{ template.template }}
+
+{% endif %}
diff --git a/salt/fedora-xfce/update-admin.top b/salt/fedora-xfce/update-admin.top
@@ -0,0 +1,10 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'I@qubes:type:template and E@^fedora-[0-9][0-9]-xfce$':
+    - match: compound
+    - fedora-xfce.update-admin
diff --git a/salt/fedora/README.md b/salt/fedora/README.md
@@ -18,8 +18,9 @@ Creates the Fedora template as well as a Disposable Template based on it.
 
 ```sh
 sudo qubesctl top.enable fedora
-sudo qubesctl --targets=fedora-40 state.apply
+sudo qubesctl --targets=fedora-41 state.apply
 sudo qubesctl top.disable fedora
+sudo qubesctl state.apply fedora.prefs
 ```
 
 *   State:
@@ -28,7 +29,8 @@ sudo qubesctl top.disable fedora
 
 ```sh
 sudo qubesctl state.apply fedora.create
-sudo qubesctl --skip-dom0 --targets=fedora-40 state.apply fedora.install
+sudo qubesctl --skip-dom0 --targets=fedora-41 state.apply fedora.install
+sudo qubesctl state.apply fedora.prefs
 ```
 
 <!-- pkg:end:post-install -->