From 965a99c9d5733506a8a90360f472bacc28abda80 Mon Sep 17 00:00:00 2001 From: qtpies <41307963+qtpies@users.noreply.github.com> Date: Thu, 30 Jul 2020 00:40:08 +0200 Subject: [PATCH 1/5] Make template upgrade documentation user-friendly Upgrading TemplateVM's by installing a new TemplateVM, then redo changes is way more user friendly, and technically there are benefits too. This option is currently behind a link at the bottom of this page , but it should be at the top. - User friendlyness: The commands involved are less in number, less error prone, and far less complex. - The technical benefit is that you are getting a fresh OS, which can not have issues that are possibly inherited from older versions. The fact that this is possible without reinstalling your laptop is actually one of the benefits of Qubes. - Of course there are users who are lacking diskspace or who are on a slow or metered internet connection. They can still use the other method. I want to explicitly include the part 'There is currently ... dependencies.' (line 33). Installing extra packages is the main thing users do in a TemplateVM, so including this saves users time from searching for such a method themselves, and it will prompt somebody who in fact does know a way to report this, because it would be a great addition. To be clear, a list of packages to be installed, should not include dependencies, because when the user manually installs packages formerly installed as dependencies, the packagemanager will not remove them automatically anymore when they are no longer needed. My addition deviates a little bit from the succinct and technical style of the rest of the page, but given that upgrading templates is a frequent operation in Qubes that no user can avoid, I think this is fair. --- user/managing-os/fedora/fedora-upgrade.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user/managing-os/fedora/fedora-upgrade.md b/user/managing-os/fedora/fedora-upgrade.md index 51d5449f..333e5575 100644 --- a/user/managing-os/fedora/fedora-upgrade.md +++ b/user/managing-os/fedora/fedora-upgrade.md @@ -23,11 +23,16 @@ redirect_from: # Upgrading Fedora TemplateVMs -This page provides instructions for performing an in-place upgrade of an installed [Fedora TemplateVM]. -If you wish to install a new, unmodified Fedora TemplateVM instead of upgrading a template that is already installed in your system, please see the [Fedora TemplateVM] page instead. +There are two ways to upgrade a TemplateVM. The easiest way is to install a new, unmodified [Fedora TemplateVM], then redo all desired template modifications. You can also do an in-place upgrade of an installed [Fedora TemplateVM]. +## Upgrading using a new TemplateVM -## Summary instructions for standard Fedora TemplateVMs +1. Please see the [Fedora TemplateVM] page on how to install the TemplateVM with the Fedora version you want to upgrade to. +2. **Recommended:** [Switch everything that was set to the old template to the new template.][switch] + +To make the upgrade process as efficient as possible, document modifications to your TemplateVMs in a textfile. If you do not have this documentation yet, open a terminal in the old Fedora TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `dnf repoquery --userinstalled` and `rpm -qa` all include packages that have been installed as dependencies.) + +## Summary instructions for in-place upgrade of standard Fedora TemplateVMs **Note:** The prompt on each line indicates where each command should be entered: `dom0`, `fedora-`, or `fedora-`, where `` is the Fedora version number *from* which you are upgrading, and `` is the Fedora version number *to* which you are upgrading. @@ -47,7 +52,7 @@ If you wish to install a new, unmodified Fedora TemplateVM instead of upgrading **Recommended:** [Switch everything that was set to the old template to the new template.][switch] -## Detailed instructions for standard Fedora TemplateVMs +## Detailed instructions for in-place upgrade of standard Fedora TemplateVMs These instructions will show you how to upgrade the standard Fedora TemplateVM. The same general procedure may be used to upgrade any template based on the standard Fedora TemplateVM. @@ -141,7 +146,7 @@ The same general procedure may be used to upgrade any template based on the stan [user@dom0 ~]$ sudo dnf remove qubes-template-fedora- -## Summary instructions for Fedora Minimal TemplateVMs +## Summary instructions for in-place upgrade of Fedora Minimal TemplateVMs **Note:** The prompt on each line indicates where each command should be entered: `dom0`, `fedora-`, or `fedora-`, where `` is the Fedora version number *from* which you are upgrading, and `` is the Fedora version number *to* which you are upgrading. @@ -194,11 +199,6 @@ In this case, you have several options: However, you may end up having to increase the disk image size anyway (see previous option). 3. Do the upgrade in parts, e.g., by using package groups. (First upgrade `@core` packages, then the rest.) - 4. Do not perform an in-place upgrade. - Instead, simply download and install a new template package, then redo all desired template modifications. - Here are some useful messages from the mailing list that also apply to TemplateVM management and migration in general from - [Marek](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/dS1jbLRP9n8J) and - [Jason M](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/5PxDfI-RKAsJ). [Fedora TemplateVM]: /doc/templates/fedora/ From e7c8b70ec3c2224f027a85ff9273557831b69177 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 5 Aug 2020 12:39:07 +0200 Subject: [PATCH 2/5] "Desired changes for pullrequest #1024" --- user/managing-os/debian/debian-upgrade.md | 4 +++- user/managing-os/debian/debian.md | 4 +++- user/managing-os/fedora/fedora-upgrade.md | 18 ++++++++---------- user/managing-os/fedora/fedora.md | 4 +++- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/user/managing-os/debian/debian-upgrade.md b/user/managing-os/debian/debian-upgrade.md index 828c102c..40004384 100644 --- a/user/managing-os/debian/debian-upgrade.md +++ b/user/managing-os/debian/debian-upgrade.md @@ -1,6 +1,6 @@ --- layout: doc -title: Upgrading Debian TemplateVMs +title: In-place upgrade of Debian TemplateVMs permalink: /doc/template/debian/upgrade/ redirect_from: - /doc/template/debian/upgrade-8-to-9/ @@ -12,6 +12,8 @@ redirect_from: # Upgrading Debian TemplateVMs +[Should I upgrade using a fresh installation or an in-place upgrade?][Upgrading Fedora TemplateVMs] + This page provides instructions for performing an in-place upgrade of an installed [Debian TemplateVM]. If you wish to install a new, unmodified Debian TemplateVM instead of upgrading a template that is already installed in your system, please see the [Debian TemplateVM] page instead. diff --git a/user/managing-os/debian/debian.md b/user/managing-os/debian/debian.md index 236c2d8e..fae6516e 100644 --- a/user/managing-os/debian/debian.md +++ b/user/managing-os/debian/debian.md @@ -46,7 +46,9 @@ Please see [Updating software in TemplateVMs]. ## Upgrading -Please see [Upgrading Debian TemplateVMs]. +There are two ways to upgrade a TemplateVM. The easiest way is to [install] the new Debian TemplateVM next to the Debian TemplateVM you are currently using. Then redo all desired template modifications, and switch everything that was set to the old template to the new template.To make this process as efficient as possible, document modifications to your TemplateVMs in a textfile. If you do not have this documentation yet, open a terminal in the old Debian TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `apt list --installed`, `dpkg -l` and `aptitude search '~i!~M'` all include packages that have been installed as dependencies.) + +You can also do an in-place upgrade of an installed Debian TemplateVM. Please see [Upgrading Debian TemplateVMs]. ## Release-specific notes diff --git a/user/managing-os/fedora/fedora-upgrade.md b/user/managing-os/fedora/fedora-upgrade.md index 333e5575..201eb325 100644 --- a/user/managing-os/fedora/fedora-upgrade.md +++ b/user/managing-os/fedora/fedora-upgrade.md @@ -1,6 +1,6 @@ --- layout: doc -title: Upgrading Fedora TemplateVMs +title: In-place upgrade of Fedora TemplateVMs permalink: /doc/template/fedora/upgrade/ redirect_from: - /doc/template/fedora/upgrade-26-to-27/ @@ -23,16 +23,13 @@ redirect_from: # Upgrading Fedora TemplateVMs -There are two ways to upgrade a TemplateVM. The easiest way is to install a new, unmodified [Fedora TemplateVM], then redo all desired template modifications. You can also do an in-place upgrade of an installed [Fedora TemplateVM]. +[Should I upgrade using a fresh installation or an in-place upgrade?][Upgrading Fedora TemplateVMs] -## Upgrading using a new TemplateVM +This page provides instructions for performing an in-place upgrade of an installed [Fedora TemplateVM]. +If you wish to install a new, unmodified Fedora TemplateVM instead of upgrading a template that is already installed in your system, please see the [Fedora TemplateVM] page instead. -1. Please see the [Fedora TemplateVM] page on how to install the TemplateVM with the Fedora version you want to upgrade to. -2. **Recommended:** [Switch everything that was set to the old template to the new template.][switch] -To make the upgrade process as efficient as possible, document modifications to your TemplateVMs in a textfile. If you do not have this documentation yet, open a terminal in the old Fedora TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `dnf repoquery --userinstalled` and `rpm -qa` all include packages that have been installed as dependencies.) - -## Summary instructions for in-place upgrade of standard Fedora TemplateVMs +## Summary instructions for standard Fedora TemplateVMs **Note:** The prompt on each line indicates where each command should be entered: `dom0`, `fedora-`, or `fedora-`, where `` is the Fedora version number *from* which you are upgrading, and `` is the Fedora version number *to* which you are upgrading. @@ -52,7 +49,7 @@ To make the upgrade process as efficient as possible, document modifications to **Recommended:** [Switch everything that was set to the old template to the new template.][switch] -## Detailed instructions for in-place upgrade of standard Fedora TemplateVMs +## Detailed instructions for standard Fedora TemplateVMs These instructions will show you how to upgrade the standard Fedora TemplateVM. The same general procedure may be used to upgrade any template based on the standard Fedora TemplateVM. @@ -146,7 +143,7 @@ The same general procedure may be used to upgrade any template based on the stan [user@dom0 ~]$ sudo dnf remove qubes-template-fedora- -## Summary instructions for in-place upgrade of Fedora Minimal TemplateVMs +## Summary instructions for Fedora Minimal TemplateVMs **Note:** The prompt on each line indicates where each command should be entered: `dom0`, `fedora-`, or `fedora-`, where `` is the Fedora version number *from* which you are upgrading, and `` is the Fedora version number *to* which you are upgrading. @@ -199,6 +196,7 @@ In this case, you have several options: However, you may end up having to increase the disk image size anyway (see previous option). 3. Do the upgrade in parts, e.g., by using package groups. (First upgrade `@core` packages, then the rest.) + 4. Do not perform an in-place upgrade, see [Upgrading Fedora TemplateVMs]. [Fedora TemplateVM]: /doc/templates/fedora/ diff --git a/user/managing-os/fedora/fedora.md b/user/managing-os/fedora/fedora.md index 46212d4c..3d7a2225 100644 --- a/user/managing-os/fedora/fedora.md +++ b/user/managing-os/fedora/fedora.md @@ -38,7 +38,9 @@ Please see [Updating software in TemplateVMs]. ## Upgrading -Please see [Upgrading Fedora TemplateVMs]. +There are two ways to upgrade a TemplateVM. The easiest way is to [install] the new Fedora TemplateVM next to the Fedora TemplateVM you are currently using. Then redo all desired template modifications, and switch everything that was set to the old template to the new template.To make this process as efficient as possible, document modifications to your TemplateVMs in a textfile. If you do not have this documentation yet, open a terminal in the old Fedora TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `dnf repoquery --userinstalled` and `rpm -qa` all include packages that have been installed as dependencies.) + +You can also do an in-place upgrade of an installed Fedora TemplateVM. Please see [Upgrading Fedora TemplateVMs]. ## Release-specific notes From 6d7511620092b56c6a30f6627e4b3399a83723ca Mon Sep 17 00:00:00 2001 From: qtpies <41307963+qtpies@users.noreply.github.com> Date: Sat, 15 Aug 2020 18:52:49 +0200 Subject: [PATCH 3/5] Update debian-upgrade.md --- user/managing-os/debian/debian-upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/managing-os/debian/debian-upgrade.md b/user/managing-os/debian/debian-upgrade.md index 40004384..42d48093 100644 --- a/user/managing-os/debian/debian-upgrade.md +++ b/user/managing-os/debian/debian-upgrade.md @@ -12,7 +12,7 @@ redirect_from: # Upgrading Debian TemplateVMs -[Should I upgrade using a fresh installation or an in-place upgrade?][Upgrading Fedora TemplateVMs] +[Should I upgrade using a fresh installation or an in-place upgrade?][Upgrading Debian TemplateVMs] This page provides instructions for performing an in-place upgrade of an installed [Debian TemplateVM]. If you wish to install a new, unmodified Debian TemplateVM instead of upgrading a template that is already installed in your system, please see the [Debian TemplateVM] page instead. From 33af714a52f49640ccd5a6984f7fbc5e5a6287e1 Mon Sep 17 00:00:00 2001 From: qtpies <41307963+qtpies@users.noreply.github.com> Date: Sat, 15 Aug 2020 18:53:22 +0200 Subject: [PATCH 4/5] Update debian.md --- user/managing-os/debian/debian.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/managing-os/debian/debian.md b/user/managing-os/debian/debian.md index 5eb9f82c..c6001707 100644 --- a/user/managing-os/debian/debian.md +++ b/user/managing-os/debian/debian.md @@ -48,7 +48,7 @@ Please see [Updating software in TemplateVMs]. ## Upgrading -There are two ways to upgrade a TemplateVM. The easiest way is to [install] the new Debian TemplateVM next to the Debian TemplateVM you are currently using. Then redo all desired template modifications, and switch everything that was set to the old template to the new template.To make this process as efficient as possible, document modifications to your TemplateVMs in a textfile. If you do not have this documentation yet, open a terminal in the old Debian TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `apt list --installed`, `dpkg -l` and `aptitude search '~i!~M'` all include packages that have been installed as dependencies.) +There are two ways to upgrade a TemplateVM. The easiest way is to [install] the new Debian TemplateVM next to the Debian TemplateVM you are currently using. Then redo all desired template modifications, and switch everything that was set to the old template to the new template.To make this process as efficient as possible, document modifications to your TemplateVMs in a text file. If you do not have this documentation yet, open a terminal in the old Debian TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `apt list --installed`, `dpkg -l` and `aptitude search '~i!~M'` all include packages that have been installed as dependencies.) You can also do an in-place upgrade of an installed Debian TemplateVM. Please see [Upgrading Debian TemplateVMs]. From c8b2a5e6584a07c1ea053a66db6d82997de7b87a Mon Sep 17 00:00:00 2001 From: qtpies <41307963+qtpies@users.noreply.github.com> Date: Sat, 15 Aug 2020 18:53:54 +0200 Subject: [PATCH 5/5] Update fedora.md --- user/managing-os/fedora/fedora.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/managing-os/fedora/fedora.md b/user/managing-os/fedora/fedora.md index 0ec70480..2de191b7 100644 --- a/user/managing-os/fedora/fedora.md +++ b/user/managing-os/fedora/fedora.md @@ -40,7 +40,7 @@ Please see [Updating software in TemplateVMs]. ## Upgrading -There are two ways to upgrade a TemplateVM. The easiest way is to [install] the new Fedora TemplateVM next to the Fedora TemplateVM you are currently using. Then redo all desired template modifications, and switch everything that was set to the old template to the new template.To make this process as efficient as possible, document modifications to your TemplateVMs in a textfile. If you do not have this documentation yet, open a terminal in the old Fedora TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `dnf repoquery --userinstalled` and `rpm -qa` all include packages that have been installed as dependencies.) +There are two ways to upgrade a TemplateVM. The easiest way is to [install] the new Fedora TemplateVM next to the Fedora TemplateVM you are currently using. Then redo all desired template modifications, and switch everything that was set to the old template to the new template.To make this process as efficient as possible, document modifications to your TemplateVMs in a text file. If you do not have this documentation yet, open a terminal in the old Fedora TemplateVM, and use the `history` command. (There is currently no other way to gain a list of explicitly installed packages. Methods like `dnf repoquery --userinstalled` and `rpm -qa` all include packages that have been installed as dependencies.) You can also do an in-place upgrade of an installed Fedora TemplateVM. Please see [Upgrading Fedora TemplateVMs].