From 49f14dcb5df25cba6e290efc7fafbf9abe647c5f Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 10 Dec 2015 00:24:18 +0000 Subject: [PATCH 1/2] Formalize shutdown step Add additional step for shutting down new Template VM and include command line input --- managing-os/fedora-template-upgrade-21.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/managing-os/fedora-template-upgrade-21.md b/managing-os/fedora-template-upgrade-21.md index a162e55c..c5ce9661 100644 --- a/managing-os/fedora-template-upgrade-21.md +++ b/managing-os/fedora-template-upgrade-21.md @@ -54,11 +54,17 @@ template based on the standard Fedora 21 template. [user@fedora-23 ~]$ sudo yum clean all [user@fedora-23 ~]$ sudo yum --releasever=23 --enablerepo=qubes*current-testing distro-sync - (Shut down TemplateVM via Qubes VM Manager; may need to be killed.) + 3. Shutdown the new TemplateVM via dom0 command line or Qubes VM Manager; may need to be killed.) + [user@dom0 ~]$ qvm-shutdown fedora-23 + + or + + [user@dom0 ~]$ qvm-shutdown --force fedora-23 + If you encounter no errors, proceed to step 7. - 3. If `yum` reports that you do not have enough free disk space to proceed with + 4. If `yum` reports that you do not have enough free disk space to proceed with the upgrade process, create an empty file in dom0 to use as a cache and attach it to the template as a virtual disk. @@ -75,14 +81,14 @@ template based on the standard Fedora 21 template. (Poweroff via Qubes VM Manager. May need to be killed.) - 4. If `yum` complains that there is not enough free space in `/usr/lib/modules`, + 5. If `yum` complains that there is not enough free space in `/usr/lib/modules`, do this before reattempting the upgrade: [user@fedora-23 ~]$ sudo mkdir /mnt/removable/modules [user@fedora-23 ~]$ sudo cp -rp /usr/lib/modules /mnt/removable/modules [user@fedora-23 ~]$ sudo mount --bind /mnt/removable/modules /usr/lib/modules - 5. `yum` may complain: + 6. `yum` may complain: At least X MB more space needed on the / filesystem. @@ -90,17 +96,17 @@ template based on the standard Fedora 21 template. image](/doc/ResizeDiskImage/) before reattempting the upgrade process. (See **Additional Information** below for other options.) - 6. After the upgrade process is finished, remove the cache file, if you + 7. After the upgrade process is finished, remove the cache file, if you created one. [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - 7. Trim the new template (see **Compacting the Upgraded Template** for details + 8. Trim the new template (see **Compacting the Upgraded Template** for details and other options). [user@dom0 ~]$ qvm-trim-template fedora-23 - 8. (Optional) Remove the old default template. + 9. (Optional) Remove the old default template. [user@dom0 ~]$ sudo yum remove qubes-template-fedora-21 From 362d7b750a15cbf1f6345d177acce32fab565e4b Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 11 Dec 2015 20:00:03 +0000 Subject: [PATCH 2/2] simplify shutdown step --- managing-os/fedora-template-upgrade-21.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/managing-os/fedora-template-upgrade-21.md b/managing-os/fedora-template-upgrade-21.md index c5ce9661..c908ea43 100644 --- a/managing-os/fedora-template-upgrade-21.md +++ b/managing-os/fedora-template-upgrade-21.md @@ -54,13 +54,9 @@ template based on the standard Fedora 21 template. [user@fedora-23 ~]$ sudo yum clean all [user@fedora-23 ~]$ sudo yum --releasever=23 --enablerepo=qubes*current-testing distro-sync - 3. Shutdown the new TemplateVM via dom0 command line or Qubes VM Manager; may need to be killed.) + 3. Shutdown the new TemplateVM via dom0 command line or Qubes VM Manager; [user@dom0 ~]$ qvm-shutdown fedora-23 - - or - - [user@dom0 ~]$ qvm-shutdown --force fedora-23 If you encounter no errors, proceed to step 7.