From e6fb72c22e10c6a4aa7bf3b842fc7af9de8644be Mon Sep 17 00:00:00 2001 From: Ben Grande <ben.grande.b@gmail.com> Date: Fri, 16 Feb 2024 23:31:57 +0100 Subject: [PATCH] feat: update template to fedora-39 --- salt/fedora-minimal/README.md | 4 ++-- salt/fedora-xfce/README.md | 4 ++-- salt/fedora-xfce/template.jinja | 2 +- salt/fedora/README.md | 4 ++-- salt/fedora/template.jinja | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/salt/fedora-minimal/README.md b/salt/fedora-minimal/README.md index 4050b31..cb0f776 100644 --- a/salt/fedora-minimal/README.md +++ b/salt/fedora-minimal/README.md @@ -19,7 +19,7 @@ it. - Top: ```sh qubesctl top.enable fedora-minimal -qubesctl --targets=fedora-38-minimal state.apply +qubesctl --targets=fedora-39-minimal state.apply qubesctl top.disable fedora-minimal ``` @@ -27,7 +27,7 @@ qubesctl top.disable fedora-minimal <!-- pkg:begin:post-install --> ```sh qubesctl state.apply fedora-minimal.create -qubesctl --skip-dom0 --targets=fedora-38-minimal state.apply fedora-minimal.install +qubesctl --skip-dom0 --targets=fedora-39-minimal state.apply fedora-minimal.install ``` <!-- pkg:end:post-install --> diff --git a/salt/fedora-xfce/README.md b/salt/fedora-xfce/README.md index 1187f25..0005d53 100644 --- a/salt/fedora-xfce/README.md +++ b/salt/fedora-xfce/README.md @@ -17,7 +17,7 @@ Creates the Fedora Xfce template as well as a Disposable Template based on it. - Top: ```sh qubesctl top.enable fedora-xfce -qubesctl --targets=fedora-38-xfce state.apply +qubesctl --targets=fedora-39-xfce state.apply qubesctl top.disable fedora-xfce ``` @@ -25,7 +25,7 @@ qubesctl top.disable fedora-xfce <!-- pkg:begin:post-install --> ```sh qubesctl state.apply fedora-xfce.create -qubesctl --skip-dom0 --targets=fedora-38-xfce state.apply fedora-xfce.install +qubesctl --skip-dom0 --targets=fedora-39-xfce state.apply fedora-xfce.install ``` <!-- pkg:end:post-install --> diff --git a/salt/fedora-xfce/template.jinja b/salt/fedora-xfce/template.jinja index 03b85d3..609841b 100644 --- a/salt/fedora-xfce/template.jinja +++ b/salt/fedora-xfce/template.jinja @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later #} {% set base = 'fedora' -%} -{% set version = salt['pillar.get']('qvm:fedora:version', '38') -%} +{% set version = salt['pillar.get']('qvm:fedora:version', '39') -%} {% set flavor = 'xfce' -%} {% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%} {% if flavor -%} diff --git a/salt/fedora/README.md b/salt/fedora/README.md index 817d219..adef462 100644 --- a/salt/fedora/README.md +++ b/salt/fedora/README.md @@ -17,7 +17,7 @@ Creates the Fedora template as well as a Disposable Template based on it. - Top: ```sh qubesctl top.enable fedora -qubesctl --targets=fedora-38 state.apply +qubesctl --targets=fedora-39 state.apply qubesctl top.disable fedora ``` @@ -25,7 +25,7 @@ qubesctl top.disable fedora <!-- pkg:begin:post-install --> ```sh qubesctl state.apply fedora.create -qubesctl --skip-dom0 --targets=fedora-38 state.apply fedora.install +qubesctl --skip-dom0 --targets=fedora-39 state.apply fedora.install ``` <!-- pkg:end:post-install --> diff --git a/salt/fedora/template.jinja b/salt/fedora/template.jinja index 3e9d2ff..b14744e 100644 --- a/salt/fedora/template.jinja +++ b/salt/fedora/template.jinja @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later #} {% set base = 'fedora' -%} -{% set version = salt['pillar.get']('qvm:fedora:version', '38') -%} +{% set version = salt['pillar.get']('qvm:fedora:version', '39') -%} {% set flavor = '' -%} {% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%} {% if flavor -%}