diff --git a/salt/fedora-minimal/README.md b/salt/fedora-minimal/README.md index a600ffb..d954ebc 100644 --- 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-41-minimal state.apply +sudo qubesctl --targets=fedora-42-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-41-minimal state.apply fedora-minimal.install +sudo qubesctl --skip-dom0 --targets=fedora-42-minimal state.apply fedora-minimal.install sudo qubesctl state.apply fedora-minimal.prefs ``` diff --git a/salt/fedora-xfce/README.md b/salt/fedora-xfce/README.md index 962a001..56a3b2f 100644 --- a/salt/fedora-xfce/README.md +++ b/salt/fedora-xfce/README.md @@ -18,7 +18,7 @@ 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-41-xfce state.apply +sudo qubesctl --targets=fedora-42-xfce state.apply sudo qubesctl top.disable fedora-xfce sudo qubesctl state.apply fedora-xfce.prefs ``` @@ -29,7 +29,7 @@ sudo qubesctl state.apply fedora-xfce.prefs ```sh sudo qubesctl state.apply fedora-xfce.create -sudo qubesctl --skip-dom0 --targets=fedora-41-xfce state.apply fedora-xfce.install +sudo qubesctl --skip-dom0 --targets=fedora-42-xfce state.apply fedora-xfce.install sudo qubesctl state.apply fedora-xfce.prefs ``` diff --git a/salt/fedora/README.md b/salt/fedora/README.md index 435c074..71b70e2 100644 --- a/salt/fedora/README.md +++ b/salt/fedora/README.md @@ -18,7 +18,7 @@ Creates the Fedora template as well as a Disposable Template based on it. ```sh sudo qubesctl top.enable fedora -sudo qubesctl --targets=fedora-41 state.apply +sudo qubesctl --targets=fedora-42 state.apply sudo qubesctl top.disable fedora sudo qubesctl state.apply fedora.prefs ``` @@ -29,7 +29,7 @@ sudo qubesctl state.apply fedora.prefs ```sh sudo qubesctl state.apply fedora.create -sudo qubesctl --skip-dom0 --targets=fedora-41 state.apply fedora.install +sudo qubesctl --skip-dom0 --targets=fedora-42 state.apply fedora.install sudo qubesctl state.apply fedora.prefs ``` diff --git a/salt/fedora/template.jinja b/salt/fedora/template.jinja index 2fc1f0e..4b0f843 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', '41') -%} +{% set version = salt['pillar.get']('qvm:fedora:version', '42') -%} {% set flavor = '' -%} {% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%} {% if flavor -%} diff --git a/salt/sys-pgp/install.sls b/salt/sys-pgp/install.sls index b582bd9..8041ce3 100644 --- a/salt/sys-pgp/install.sls +++ b/salt/sys-pgp/install.sls @@ -22,15 +22,14 @@ include: - gnupg2 - man-db -{# TODO: sequoia-wot can't be installed on fedora-41 #} +{# TODO: sequoia-wot and sequoia-keyring-linter can't be installed on fedora-42 #} {% set pkg = { 'Debian': { 'pkg': ['sq', 'sq-keyring-linter', 'sq-wot', 'sqop', 'sqv'], }, 'RedHat': { - 'pkg': ['sequoia-sq', 'sequoia-keyring-linter', 'sequoia-sop', - 'sequoia-sqv', 'sequoia-policy-config', - 'sequoia-chameleon-gnupg'], + 'pkg': ['sequoia-sq', 'sequoia-sop', 'sequoia-sqv', + 'sequoia-policy-config', 'sequoia-chameleon-gnupg'], }, }.get(grains.os_family) -%} diff --git a/scripts/version-update.sh b/scripts/version-update.sh new file mode 100755 index 0000000..15708f8 --- /dev/null +++ b/scripts/version-update.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +## SPDX-FileCopyrightText: 2025 Benjamin Grande M. S. +## +## SPDX-License-Identifier: AGPL-3.0-or-later + +set -eu + +usage(){ + printf '%s\n' "Usage: ${0##*/} TEMPLATE OLD_VERSION NEW_VERSION +Example: ${0##*/} fedora 41 42" >&2 + exit 1 +} + +case "${1-}" in + ""|-h|--?help) usage;; + *) ;; +esac + +command -v git >/dev/null || + { printf '%s\n' "Missing program: git" >&2; exit 1; } +repo_toplevel="$(git rev-parse --show-toplevel)" +test -d "${repo_toplevel}" || exit 1 +cd "${repo_toplevel}" +unset repo_toplevel + +template="${1}" +old_version="${2}" +new_version="${3}" + +sed -i "s/${old_version}/${new_version}/" salt/"${template}"*/template.jinja +sed -i "s/${template}-${old_version}/${template}-${new_version}/" \ + salt/"${template}"*/README.md