From b7a000ad061c082cd47cc0be3b65247fc2f6daba Mon Sep 17 00:00:00 2001 From: Rune Philosof <57357936+runephilosof-abtion@users.noreply.github.com> Date: Mon, 22 Jan 2024 07:54:23 +0100 Subject: [PATCH] fedora-upgrade.md: Update template-name The qubes-updater has started using the qvm-features template-name to check whether the template is supported. So the template name needs to be updated. https://github.com/QubesOS/qubes-desktop-linux-manager/blob/main/qui/utils.py#L83-L95 Partly fixes: https://github.com/QubesOS/qubes-issues/issues/8725 Still missing the other in-place template upgrade instructions. --- user/templates/fedora/fedora-upgrade.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/user/templates/fedora/fedora-upgrade.md b/user/templates/fedora/fedora-upgrade.md index 2529e1de..2d5dad90 100644 --- a/user/templates/fedora/fedora-upgrade.md +++ b/user/templates/fedora/fedora-upgrade.md @@ -51,6 +51,7 @@ If you wish to install a new, unmodified Fedora template instead of upgrading a [user@dom0 ~]$ qvm-shutdown fedora- [user@dom0 ~]$ sudo losetup -d $dev [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img +[user@dom0 ~]$ qvm-features fedora- template-name fedora- ``` **Recommended:** [Switch everything that was set to the old template to the new template.](/doc/templates/#switching) @@ -159,15 +160,21 @@ The same general procedure may be used to upgrade any template based on the stan [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img ``` -8. (Recommended) [Switch everything that was set to the old template to the new template.](/doc/templates/#switching) +8. Set the template-name, which is used by the Qubes updater. -9. (Optional) Make the new template the global default. + ``` + [user@dom0 ~]$ qvm-features fedora- template-name fedora- + ``` + +9. (Recommended) [Switch everything that was set to the old template to the new template.](/doc/templates/#switching) + +10. (Optional) Make the new template the global default. ``` [user@dom0 ~]$ qubes-prefs --set default_template fedora- ``` -10. (Optional) [Uninstall the old template.](/doc/templates/#uninstalling) +11. (Optional) [Uninstall the old template.](/doc/templates/#uninstalling) Make sure that the template you're uninstalling is the old one, not the new one! ## Summary instructions for Fedora Minimal templates @@ -180,6 +187,7 @@ The same general procedure may be used to upgrade any template based on the stan [root@fedora--minimal ~]# dnf clean all [user@fedora--minimal ~]# dnf --releasever= --best --allowerasing distro-sync [user@fedora--minimal ~]# fstrim -v / +[user@dom0 ~]$ qvm-features fedora--minimal template-name fedora- ``` (Shut down template by any normal means.)