From 207b5e501958b7c121a8f02860e2f3f73134f9b4 Mon Sep 17 00:00:00 2001 From: deeplow Date: Thu, 9 Nov 2023 10:44:19 +0000 Subject: [PATCH] Note that upgrades repo upgrades apply only to 4.1+ At noted by Marek [1] GPG keyrings for verifying 4.1+ packages only started being available in 4.1 templates. Telling people to fetch the keyrings through another method would make instructions too complicated. For this reason it seems simpler to just tell people to use the new templates instead. [1]: https://github.com/QubesOS/qubes-doc/pull/1345#issuecomment-1803517947 --- .../upgrade/4_2.md | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/user/downloading-installing-upgrading/upgrade/4_2.md b/user/downloading-installing-upgrading/upgrade/4_2.md index a80ff90d..058d481b 100644 --- a/user/downloading-installing-upgrading/upgrade/4_2.md +++ b/user/downloading-installing-upgrading/upgrade/4_2.md @@ -31,16 +31,27 @@ in-place: 4. [Restore from your backup](/doc/how-to-back-up-restore-and-migrate/#restoring-from-a-backup) on your new 4.2 installation. -5. In each old the old templates update the Qubes software sources from 4.1 to Qubes 4.2. Do this by opening a teminal in each of the imported templates and running the following commands: +5. In each old the old templates update the Qubes software sources from 4.1 to Qubes 4.2. + > **Note**: If the templates were first installed on a version older than + > Qubes 4.1, you should reinstall them. For example, your first Qubes install + > was 4.0 and you've been upgrading to Qubes 4.2 via clean install ever since, + > then this affects you and you should instead use the templates that come + > preinstalled in 4.2. + + If the above note does not apply, you should open a teminal in each of the + imported templates and running the following commands: - **Debian-based templates**: ``` - sudo sed -i 's/r4.[01]/r4.2/g' /etc/apt/sources.list.d/qubes-r4.list + sudo sed -i 's/r4.1/r4.2/g' /etc/apt/sources.list.d/qubes-r4.list sudo sed -i 's|\[arch=amd64\]|\[arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg \]|g' /etc/apt/sources.list.d/qubes-r4.list + sudo apt update + sudo apt upgrade ``` - - **Fedora-based templates**: + - **Fedora-based templates**: ``` - sudo sed -i 's/r4.[01]/r4.2/g' /etc/yum.repos.d/qubes-r4.repo - sudo sed -i 's/RPM-GPG-KEY-qubes-4\(\.1\)\{0,1\}-/RPM-GPG-KEY-qubes-4.2-/g' /etc/yum.repos.d/qubes-r4.repo + sudo sed -i 's/r4.1/r4.2/g' /etc/yum.repos.d/qubes-r4.repo + sudo sed -i 's/RPM-GPG-KEY-qubes-4.1-/RPM-GPG-KEY-qubes-4.2-/g' /etc/yum.repos.d/qubes-r4.repo + sudo dnf update ``` ## In-place upgrade