"Desired changes for pullrequest #1024"

This commit is contained in:
jason 2020-08-05 12:39:07 +02:00
parent 965a99c9d5
commit e7c8b70ec3
4 changed files with 17 additions and 13 deletions

View File

@ -1,6 +1,6 @@
--- ---
layout: doc layout: doc
title: Upgrading Debian TemplateVMs title: In-place upgrade of Debian TemplateVMs
permalink: /doc/template/debian/upgrade/ permalink: /doc/template/debian/upgrade/
redirect_from: redirect_from:
- /doc/template/debian/upgrade-8-to-9/ - /doc/template/debian/upgrade-8-to-9/
@ -12,6 +12,8 @@ redirect_from:
# Upgrading Debian TemplateVMs # 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]. 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. 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.

View File

@ -46,7 +46,9 @@ Please see [Updating software in TemplateVMs].
## Upgrading ## 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 ## Release-specific notes

View File

@ -1,6 +1,6 @@
--- ---
layout: doc layout: doc
title: Upgrading Fedora TemplateVMs title: In-place upgrade of Fedora TemplateVMs
permalink: /doc/template/fedora/upgrade/ permalink: /doc/template/fedora/upgrade/
redirect_from: redirect_from:
- /doc/template/fedora/upgrade-26-to-27/ - /doc/template/fedora/upgrade-26-to-27/
@ -23,16 +23,13 @@ redirect_from:
# Upgrading Fedora TemplateVMs # 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 standard Fedora TemplateVMs
## 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-<old>`, or `fedora-<new>`, where `<old>` is the Fedora version number *from* which you are upgrading, and `<new>` is the Fedora version number *to* which you are upgrading. **Note:** The prompt on each line indicates where each command should be entered: `dom0`, `fedora-<old>`, or `fedora-<new>`, where `<old>` is the Fedora version number *from* which you are upgrading, and `<new>` 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] **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. 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. 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-<old> [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-<old>
## 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-<old>`, or `fedora-<new>`, where `<old>` is the Fedora version number *from* which you are upgrading, and `<new>` is the Fedora version number *to* which you are upgrading. **Note:** The prompt on each line indicates where each command should be entered: `dom0`, `fedora-<old>`, or `fedora-<new>`, where `<old>` is the Fedora version number *from* which you are upgrading, and `<new>` 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). 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. 3. Do the upgrade in parts, e.g., by using package groups.
(First upgrade `@core` packages, then the rest.) (First upgrade `@core` packages, then the rest.)
4. Do not perform an in-place upgrade, see [Upgrading Fedora TemplateVMs].
[Fedora TemplateVM]: /doc/templates/fedora/ [Fedora TemplateVM]: /doc/templates/fedora/

View File

@ -38,7 +38,9 @@ Please see [Updating software in TemplateVMs].
## Upgrading ## 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 ## Release-specific notes