From e63030c32a931f204426731f2ac211f0da368c0b Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Mon, 2 Sep 2019 12:37:17 -0500 Subject: [PATCH] Make fstrim step optional instead of recommended and explain why --- user/managing-os/debian/debian-upgrade.md | 10 +++++----- user/managing-os/fedora/fedora-upgrade.md | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/user/managing-os/debian/debian-upgrade.md b/user/managing-os/debian/debian-upgrade.md index 9e844ae9..828c102c 100644 --- a/user/managing-os/debian/debian-upgrade.md +++ b/user/managing-os/debian/debian-upgrade.md @@ -29,10 +29,6 @@ In general, upgrading a Debian TemplateVM follows the same process as [upgrading [user@debian- ~]$ sudo apt update [user@debian- ~]$ sudo apt upgrade [user@debian- ~]$ sudo apt dist-upgrade - [user@debian- ~]$ sudo fstrim -av - [user@dom0 ~]$ qvm-shutdown debian- - [user@dom0 ~]$ qvm-start debian- - [user@debian- ~]$ sudo fstrim -av [user@dom0 ~]$ qvm-shutdown debian- **Recommended:** [Switch everything that was set to the old template to the new template.][switch] @@ -76,7 +72,9 @@ The same general procedure may be used to upgrade any template based on the stan [user@debian- ~]$ sudo apt-get clean - 7. (Recommended) Trim the new template. + 7. (Optional) Trim the new template. + (This should [no longer be necessary][template-notes], but it does not hurt. + Some users have [reported][5055] that it makes a difference.) [user@debian- ~]$ sudo fstrim -av [user@dom0 ~]$ qvm-shutdown debian- @@ -161,4 +159,6 @@ We strongly recommend against using any Debian release that has reached [end-of- [buster]: https://www.debian.org/releases/buster/amd64/release-notes/ch-upgrading.en.html [end-of-life (EOL)]: https://wiki.debian.org/DebianReleases#Production_Releases [StandaloneVM]: /doc/standalone-and-hvm/ +[template-notes]: /doc/templates/#important-notes +[5055]: https://github.com/QubesOS/qubes-issues/issues/5055 diff --git a/user/managing-os/fedora/fedora-upgrade.md b/user/managing-os/fedora/fedora-upgrade.md index ae12684f..51d5449f 100644 --- a/user/managing-os/fedora/fedora-upgrade.md +++ b/user/managing-os/fedora/fedora-upgrade.md @@ -40,10 +40,6 @@ If you wish to install a new, unmodified Fedora TemplateVM instead of upgrading [user@fedora- ~]$ sudo mount /dev/xvdi /mnt/removable [user@fedora- ~]$ sudo dnf clean all [user@fedora- ~]$ sudo dnf --releasever= --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - [user@fedora- ~]$ sudo fstrim -av - [user@dom0 ~]$ qvm-shutdown fedora- - [user@dom0 ~]$ qvm-start fedora- - [user@fedora- ~]$ sudo fstrim -av [user@dom0 ~]$ qvm-shutdown fedora- [user@dom0 ~]$ sudo losetup -d $dev [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img @@ -115,7 +111,9 @@ The same general procedure may be used to upgrade any template based on the stan [user@fedora- ~]$ cat /etc/fedora-release - 5. (Recommended) Trim the new template. + 5. (Optional) Trim the new template. + (This should [no longer be necessary][template-notes], but it does not hurt. + Some users have [reported][5055] that it makes a difference.) [user@fedora- ~]$ sudo fstrim -av [user@dom0 ~]$ qvm-shutdown fedora- @@ -210,4 +208,6 @@ In this case, you have several options: [DispVM]: /doc/dispvm/ [end-of-life (EOL)]: https://fedoraproject.org/wiki/End_of_life [StandaloneVM]: /doc/standalone-and-hvm/ +[template-notes]: /doc/templates/#important-notes +[5055]: https://github.com/QubesOS/qubes-issues/issues/5055