From 4e1950e9e12b0f7066e58a02d80cca51ab74ec4a Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 16 Aug 2020 03:49:30 -0500 Subject: [PATCH] Improve Fedora and Debian upgrade information --- user/managing-os/debian/debian-upgrade.md | 5 ++--- user/managing-os/debian/debian.md | 10 +++++----- user/managing-os/fedora/fedora-upgrade.md | 5 ++--- user/managing-os/fedora/fedora.md | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/user/managing-os/debian/debian-upgrade.md b/user/managing-os/debian/debian-upgrade.md index 42d48093..fd57929c 100644 --- a/user/managing-os/debian/debian-upgrade.md +++ b/user/managing-os/debian/debian-upgrade.md @@ -12,10 +12,8 @@ redirect_from: # Upgrading Debian 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. +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. ([Learn more about the two options.][Debian TemplateVM Upgrade]) In general, upgrading a Debian TemplateVM follows the same process as [upgrading a native Debian system][upgrade]. @@ -154,6 +152,7 @@ We strongly recommend against using any Debian release that has reached [end-of- [Debian TemplateVM]: /doc/templates/debian/ +[Debian TemplateVM Upgrade]: /doc/templates/debian/#upgrading [upgrade]: https://wiki.debian.org/DebianUpgrade [switch]: /doc/templates/#switching [jessie]: https://www.debian.org/releases/jessie/amd64/release-notes/ch-upgrading.en.html diff --git a/user/managing-os/debian/debian.md b/user/managing-os/debian/debian.md index c6001707..ae94a283 100644 --- a/user/managing-os/debian/debian.md +++ b/user/managing-os/debian/debian.md @@ -41,16 +41,16 @@ After installing a fresh Debian TemplateVM, we recommend performing the followin ## Updating -Routine daily updates within a given release. - -Please see [Updating software in TemplateVMs]. +For routine daily TemplateVM updates within a given Debian release, 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 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.) +There are two ways to upgrade your TemplateVM to a new Debian release: -You can also do an in-place upgrade of an installed Debian TemplateVM. Please see [Upgrading Debian TemplateVMs]. + - [Install a fresh template to replace the existing one.](#installing) This option may be simpler for less experienced users. After you install the new template, redo all desired template modifications and [switch everything that was set to the old template to the new template][switch]. You may want to write down the modifications you make to your templates so that you remember what to redo on each fresh install. In the old Debian template, see `/var/log/dpkg.log` and `/var/log/apt/history.log` for logs of package manager actions. + + - [Perform an in-place upgrade of an existing Debian template.][Upgrading Debian TemplateVMs] This option will preserve any modifications you've made to the template, but it may be more complicated for less experienced users. ## Release-specific notes diff --git a/user/managing-os/fedora/fedora-upgrade.md b/user/managing-os/fedora/fedora-upgrade.md index 201eb325..11e823b7 100644 --- a/user/managing-os/fedora/fedora-upgrade.md +++ b/user/managing-os/fedora/fedora-upgrade.md @@ -23,10 +23,8 @@ redirect_from: # Upgrading Fedora 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 [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. +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. ([Learn more about the two options.][Fedora TemplateVM Upgrade]) ## Summary instructions for standard Fedora TemplateVMs @@ -200,6 +198,7 @@ In this case, you have several options: [Fedora TemplateVM]: /doc/templates/fedora/ +[Fedora TemplateVM Upgrade]: /doc/templates/fedora/#upgrading [resize-disk-image]: /doc/resize-disk-image/ [Additional Information]: #additional-information [switch]: /doc/templates/#switching diff --git a/user/managing-os/fedora/fedora.md b/user/managing-os/fedora/fedora.md index 2de191b7..a7eb261b 100644 --- a/user/managing-os/fedora/fedora.md +++ b/user/managing-os/fedora/fedora.md @@ -33,17 +33,16 @@ After installing a fresh Fedora TemplateVM, we recommend performing the followin ## Updating -Routine daily updates within a given release. - -Please see [Updating software in TemplateVMs]. +For routine daily updates within a given release, 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 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.) +There are two ways to upgrade your TemplateVM to a new Fedora release: -You can also do an in-place upgrade of an installed Fedora TemplateVM. Please see [Upgrading Fedora TemplateVMs]. + - [Install a fresh template to replace the existing one.](#installing) This option may be simpler for less experienced users. After you install the new template, redo all desired template modifications and [switch everything that was set to the old template to the new template][switch]. You may want to write down the modifications you make to your templates so that you remember what to redo on each fresh install. To see a log of package manager actions, open a terminal in the old Fedora template and use the `dnf history` command. + - [Perform an in-place upgrade of an existing Fedora template.][Upgrading Fedora TemplateVMs] This option will preserve any modifications you've made to the template, but it may be more complicated for less experienced users. [TemplateVM]: /doc/templates/