From f7912e9d17758ec02c7ff6fe80696aa5edf99e3d Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sat, 6 Apr 2019 19:21:49 -0500 Subject: [PATCH] Fix broken links and remove deprecated pages QubesOS/qubes-issues#4936 --- common-tasks/managing-appvm-shortcuts.md | 2 +- .../templates/debian/upgrade-8-to-9.md | 2 +- managing-os/templates/fedora.md | 6 - .../templates/fedora/upgrade-18-to-20.md | 75 ---- .../templates/fedora/upgrade-20-to-21.md | 225 ---------- .../templates/fedora/upgrade-21-to-23.md | 216 ---------- .../templates/fedora/upgrade-23-to-24.md | 238 ----------- .../templates/fedora/upgrade-24-to-25.md | 241 ----------- .../templates/fedora/upgrade-25-to-26.md | 386 ------------------ .../templates/fedora/upgrade-26-to-27.md | 162 +------- .../templates/fedora/upgrade-27-to-28.md | 166 +------- .../templates/fedora/upgrade-28-to-29.md | 14 +- managing-os/windows/windows-tools.md | 18 +- releases/3.1/release-notes.md | 2 +- 14 files changed, 22 insertions(+), 1731 deletions(-) delete mode 100644 managing-os/templates/fedora/upgrade-18-to-20.md delete mode 100644 managing-os/templates/fedora/upgrade-20-to-21.md delete mode 100644 managing-os/templates/fedora/upgrade-21-to-23.md delete mode 100644 managing-os/templates/fedora/upgrade-23-to-24.md delete mode 100644 managing-os/templates/fedora/upgrade-24-to-25.md delete mode 100644 managing-os/templates/fedora/upgrade-25-to-26.md diff --git a/common-tasks/managing-appvm-shortcuts.md b/common-tasks/managing-appvm-shortcuts.md index bb1d598b..5f71eb54 100644 --- a/common-tasks/managing-appvm-shortcuts.md +++ b/common-tasks/managing-appvm-shortcuts.md @@ -76,7 +76,7 @@ If you only want to create a shortcut for a single AppVM, you can create a custo What about applications in DispVMs? ----------------------------------- -[See here](/doc/disposablevm-customization/#adding-arbitrary-programs-to-disposablevm-application-menu). +[See here](/doc/disposablevm-customization/). Behind the scenes ----------------- diff --git a/managing-os/templates/debian/upgrade-8-to-9.md b/managing-os/templates/debian/upgrade-8-to-9.md index aa12b564..b7250e73 100644 --- a/managing-os/templates/debian/upgrade-8-to-9.md +++ b/managing-os/templates/debian/upgrade-8-to-9.md @@ -75,7 +75,7 @@ any template based on the standard Debian 8 template. [user@dom0 ~]$ qvm-trim-template debian-9 8. (Recommended) [Switch everything that was set to the old template to the new - template.](/doc/templates/#how-to-switch-templates-32) + template.](/doc/templates/#how-to-switch-templates) 9. (Optional) Remove the old default template. diff --git a/managing-os/templates/fedora.md b/managing-os/templates/fedora.md index bd67c531..bd7d6632 100644 --- a/managing-os/templates/fedora.md +++ b/managing-os/templates/fedora.md @@ -51,12 +51,6 @@ To upgrade your Fedora TemplateVM, please consult the guide that corresponds to * [Upgrading the Fedora 28 Template to Fedora 29](/doc/template/fedora/upgrade-28-to-29/) * [Upgrading the Fedora 27 Template to Fedora 28](/doc/template/fedora/upgrade-27-to-28/) * [Upgrading the Fedora 26 Template to Fedora 27](/doc/template/fedora/upgrade-26-to-27/) - * [Upgrading the Fedora 25 Template to Fedora 26](/doc/template/fedora/upgrade-25-to-26/) - * [Upgrading the Fedora 24 Template to Fedora 25](/doc/template/fedora/upgrade-24-to-25/) - * [Upgrading the Fedora 23 Template to Fedora 24](/doc/template/fedora/upgrade-23-to-24/) - * [Upgrading the Fedora 21 Template to Fedora 23](/doc/template/fedora/upgrade-21-to-23/) - * [Upgrading the Fedora 20 Template to Fedora 21](/doc/template/fedora/upgrade-20-to-21/) - * [Upgrading the Fedora 18 Template to Fedora 20](/doc/template/fedora/upgrade-18-to-20/) [TemplateVM]: /doc/templates/ diff --git a/managing-os/templates/fedora/upgrade-18-to-20.md b/managing-os/templates/fedora/upgrade-18-to-20.md deleted file mode 100644 index 00f4394a..00000000 --- a/managing-os/templates/fedora/upgrade-18-to-20.md +++ /dev/null @@ -1,75 +0,0 @@ ---- -layout: doc -title: Upgrading the Fedora 18 Template to Fedora 20 -permalink: /doc/template/fedora/upgrade-18-to-20/ -redirect_from: -- /doc/fedora-template-upgrade-18/ -- /en/doc/fedora-template-upgrade-18/ -- /doc/FedoraTemplateUpgrade18/ -- /wiki/FedoraTemplateUpgrade/ ---- - -Upgrading the Fedora 18 Template -================================ - -(**Note:** There is a [newer version of this page for upgrading from Fedora 20 to Fedora 21](/doc/fedora-template-upgrade-20/).) - -This instruction in simplified version of [official Fedora instruction](https://fedoraproject.org/wiki/Upgrading_Fedora_using_yum). Note that only "yum" method will work in Qubes template VM (if you are curious why: mostly because template VM does not have own bootloader). - -Upgrading Fedora 18 to Fedora 20 --------------------------------- - -Commands to run in dom0 console (you can do the same from Qubes Manager): - -~~~ -qvm-clone fedora-18-x64 fedora-20-x64 -qvm-run -a fedora-20-x64 gnome-terminal -~~~ - -Commands to run in new fedora-20-x64 template: - -~~~ -sudo yum --releasever=20 distro-sync -poweroff -~~~ - -If you have installed a lot of software in your template, it may happen that you don't have enough disk space for upgrade. Yum will tell you this just after confirming the operation (before it change anything to your system). In that case you need to provide some "external" place for yum cache (uses about 2GB during upgrade). For example attach virtual disk stored in some file. Prepare the file in dom0: - -~~~ -truncate -s 5GB /var/tmp/template-upgrade-cache.img -qvm-block -A fedora-20-x64 dom0:/var/tmp/template-upgrade-cache.img -~~~ - -Then use it in template: - -~~~ -sudo mkfs.ext4 /dev/xvdi -sudo mount /dev/xvdi /mnt/removable -sudo yum --releasever=20 --setopt=cachedir=/mnt/removable distro-sync -~~~ - -After upgrade is finished, you can remove /var/tmp/template-upgrade-cache.img file. - -Compacting templates root.img ------------------------------ - -fstrim, nor "discard" mount option do not work on template root fs, so when some file is removed in the template, space isn't freed in dom0. This means that template will use about twice a space that is really need after upgrade. - -**If you have at least `qubes-core-dom0-2.1.68` installed, you can use `qvm-trim-template` tool. Otherwise use instructions below.** - -You can compact root.img in the "old way", you'll need about 15GB (template's max size + really used space there) in dom0 for this operation: Start the template, fill all the free space with zeros, for example with: - -~~~ -dd if=/dev/zero of=/var/tmp/zero -(wait for "No space left on device" error) -rm -f /var/tmp/zero -~~~ - -Then shutdown template and all VMs based on it. Go into template directory in dom0 (/var/lib/qubes/vm-templates/fedora-20-x64 or so) and issue: - -~~~ -cp --sparse=always root.img root.img.new -mv root.img.new root.img -~~~ - -Done. diff --git a/managing-os/templates/fedora/upgrade-20-to-21.md b/managing-os/templates/fedora/upgrade-20-to-21.md deleted file mode 100644 index 46e1b3a9..00000000 --- a/managing-os/templates/fedora/upgrade-20-to-21.md +++ /dev/null @@ -1,225 +0,0 @@ ---- -layout: doc -title: Upgrading the Fedora 20 Template to Fedora 21 -permalink: /doc/template/fedora/upgrade-20-to-21/ -redirect_from: -- /doc/fedora-template-upgrade-20/ -- /en/doc/fedora-template-upgrade-20/ -- /doc/FedoraTemplateUpgrade20/ -- /wiki/FedoraTemplateUpgrade20/ ---- - -Upgrading the Fedora 20 Template -================================ - -Summary: Upgrading the Standard Fedora 20 Template to Fedora 21 ---------------------------------------------------------------- - - [user@dom0 ~]$ qvm-clone fedora-20-x64 fedora-21 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-21 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-21 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-21 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-21 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-21 ~]$ sudo mkdir /mnt/removable/modules - [user@fedora-21 ~]$ sudo cp -rp /usr/lib/modules /mnt/removable/modules - [user@fedora-21 ~]$ sudo mount --bind /mnt/removable/modules /usr/lib/modules - [user@fedora-21 ~]$ sudo yum erase nautilus-actions libcacard - [user@fedora-21 ~]$ sudo yum clean all - [user@fedora-21 ~]$ sudo yum --releasever=21 --setopt=cachedir=/mnt/removable distro-sync - [user@fedora-21 ~]$ sudo cp /usr/lib/qubes/init/ip* /etc/sysconfig/ - - (Shut down TemplateVM via Qubes VM Manager; may need to be killed.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-21 gnome-terminal - [user@fedora-21 ~]$ sudo yum -y update - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-21 - -Detailed: Upgrading the Standard Fedora 20 Template to Fedora 21 ----------------------------------------------------------------- - -These instructions will show you how to upgrade the standard Fedora 20 -TemplateVM to Fedora 21. The same general procedure may be used to upgrade any -template based on the standard Fedora 20 template. - - 1. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-20-x64 fedora-21 - [user@dom0 ~]$ qvm-run -a fedora-21 gnome-terminal - - 2. Attempt the upgrade process in the new template. - - [user@fedora-21 ~]$ sudo yum erase nautilus-actions libcacard - [user@fedora-21 ~]$ sudo yum clean all - [user@fedora-21 ~]$ sudo yum --releasever=21 distro-sync - [user@fedora-21 ~]$ sudo cp /usr/lib/qubes/init/ip* /etc/sysconfig/ - - (Shut down TemplateVM via Qubes VM Manager; may need to be killed.) - - 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 - the upgrade process, create an empty file in dom0 to use as a cache and - attach it to the template as a virtual disk. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-21 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time using the virtual disk as - a cache. - - [user@fedora-21 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-21 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-21 ~]$ sudo yum erase nautilus-actions libcacard - [user@fedora-21 ~]$ sudo yum clean all - [user@fedora-21 ~]$ sudo yum --releasever=21 --setopt=cachedir=/mnt/removable distro-sync - [user@fedora-21 ~]$ sudo cp /usr/lib/qubes/init/ip* /etc/sysconfig/ - - (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`, - do this before reattempting the upgrade: - - [user@fedora-21 ~]$ sudo mkdir /mnt/removable/modules - [user@fedora-21 ~]$ sudo cp -rp /usr/lib/modules /mnt/removable/modules - [user@fedora-21 ~]$ sudo mount --bind /mnt/removable/modules /usr/lib/modules - - 5. `yum` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - 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 - created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 7. Ensure your new template is fully updated. - - [user@dom0 ~]$ qvm-run -a fedora-21 gnome-terminal - [user@fedora-21 ~]$ sudo yum -y update - - 8. Trim the new template (see **Compacting the Upgraded Template** for details - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-21 - - 9. (Optional) Remove the old default template. - - [user@dom0 ~]$ sudo yum remove qubes-template-fedora-20-x64 - - -Summary: Upgrading the Minimal Fedora 20 Template to Fedora 21 --------------------------------------------------------------- - - [user@dom0 ~]$ qvm-clone fedora-20-x64-minimal fedora-21-minimal - [user@dom0 ~]$ qvm-run -a fedora-21-minimal xterm - [user@fedora-21-minimal ~]$ su - - [root@fedora-21-minimal ~]# yum clean all - [user@fedora-21-minimal ~]# yum --releasever=21 distro-sync - [user@fedora-21-minimal ~]# cp /usr/lib/qubes/init/ip* /etc/sysconfig/ - - (Shut down the TemplateVM via Qubes VM Manager. May need to be killed.) - - [user@dom0 ~]$ qvm-run -a fedora-21-minimal xterm - [user@fedora-21-minimal ~]$ su - - [root@fedora-21-minimal ~]# yum -y update - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-21-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Differences Between the Standard and Minimal Upgrade Procedures ---------------------------------------------------------------- - -The procedure for upgrading the minimal template (or any template based on the -minimal template) is the same as the procedure for the standard template above, -**with the following exceptions**: - - 1. `gnome-terminal` is not installed by default. Unless you've installed it - (or another terminal emulator), use `xterm`. (Of course, you can also use - `xterm` for the standard template, if you prefer.) - 2. `nautilus-actions` and `libcacard` are not installed by default, so do not - try to erase them (unless you've installed them). - 3. `sudo` is not installed by default. Unless you've installed it, use `su` as - demonstrated above. (Of course, you can also use `su` for the standard - template, if you prefer.) - - -Compacting the Upgraded Template --------------------------------- - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -If you have at least `qubes-core-dom0-2.1.68` installed and are on Qubes R2, -you can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-21 - -If you do not have `qubes-core-dom0-2.1.68` or are on Qubes R3-rc1, you can -compact the `root.img` manually. To do this, you will need about 15GB (the -TemplateVM's max size + the actually used space there) free space in dom0. - - 1. Start the template and fill all the free space with zeros, for example - with: - - [user@fedora-21 ~]$ dd if=/dev/zero of=/var/tmp/zero - - 2. Wait for the "No space left on device" error. Then: - - [user@fedora-21 ~]$ rm -f /var/tmp/zero - - 3. Shut down the template and all VMs based on it. Then: - - [user@dom0 ~]$ cd /var/lib/qubes/vm-templates/fedora-21 - [user@dom0 ~]$ cp --sparse=always root.img root.img.new - [user@dom0 ~]$ mv root.img.new root.img - - -Additional Information ----------------------- - -As mentioned above, you may encounter the following `yum` error: - - At least X MB more space needed on the / filesystem. - -In this case, you have several options: - - 1. [Increase the TemplateVM's disk image size](/doc/resize-disk-image/). - This is the solution mentioned in the main instructions above. - 2. Delete files in order to free up space. One way to do this is by - uninstalling packages. You may then reinstall them again after you - finish the upgrade process, if desired). However, you may end up having to - increase the disk image size anyway (see previous option). - 3. Increase the `root.img` size with `qvm-grow-root`. It should be easy to - extend the `qvm-grow-root` tool in order to support PV (and not only HVM) - VMs. However, someone would need to do this (patches welcome). - 4. Do the upgrade in parts, e.g., by using package groups. (First upgrade - `@core` packages, then the rest.) - 5. Do not perform an in-place upgrade. Instead, simply download and install a - new template package, then redo all desired template modifications. - -With regard to the last option, here are some useful messages from the mailing -list which also apply to TemplateVM management and migration in general: - - * [Marek](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/dS1jbLRP9n8J) - * [Jason M](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/5PxDfI-RKAsJ) - -Known issues with Fedora 21 ---------------------------- - -* [The "Update VM" command in Qubes Manager does not work](https://github.com/QubesOS/qubes-issues/issues/982). diff --git a/managing-os/templates/fedora/upgrade-21-to-23.md b/managing-os/templates/fedora/upgrade-21-to-23.md deleted file mode 100644 index 075ffa13..00000000 --- a/managing-os/templates/fedora/upgrade-21-to-23.md +++ /dev/null @@ -1,216 +0,0 @@ ---- -layout: doc -title: Upgrading the Fedora 21 Template to Fedora 23 -permalink: /doc/template/fedora/upgrade-21-to-23/ -redirect_from: -- /doc/fedora-template-upgrade-21/ -- /en/doc/fedora-template-upgrade-21/ -- /doc/FedoraTemplateUpgrade21/ -- /wiki/FedoraTemplateUpgrade21/ ---- - -Upgrading the Fedora 21 Template -================================ - -Summary: Upgrading the Standard Fedora 21 Template to Fedora 23 ---------------------------------------------------------------- - - [user@dom0 ~]$ qvm-clone fedora-21 fedora-23 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-23 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-23 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-23 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-23 ~]$ sudo mount /dev/xvdi /mnt/removable - [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 - [user@fedora-23 ~]$ sudo yum clean all - [user@fedora-23 ~]$ sudo yum --releasever=23 --enablerepo=qubes*current-testing --setopt=cachedir=/mnt/removable distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-trim-template fedora-23 - - (Done.) - -Detailed: Upgrading the Standard Fedora 21 Template to Fedora 23 ----------------------------------------------------------------- - -These instructions will show you how to upgrade the standard Fedora 21 -TemplateVM to Fedora 23. The same general procedure may be used to upgrade any -template based on the standard Fedora 21 template. - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-21 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-21 fedora-23 - [user@dom0 ~]$ qvm-run -a fedora-23 gnome-terminal - - 2. Attempt the upgrade process in the new template. For now you need to enable testing repository to do that. - - [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; - - [user@dom0 ~]$ qvm-shutdown fedora-23 - - If you encounter no errors, proceed to step 7. - - 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-23 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time using the virtual disk as - a cache. - - [user@fedora-23 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-23 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-23 ~]$ sudo yum clean all - [user@fedora-23 ~]$ sudo yum --releasever=23 --enablerepo=qubes*current-testing --setopt=cachedir=/mnt/removable distro-sync - - (Poweroff via Qubes VM Manager. May need to be killed.) - - 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 - - 6. `yum` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image](/doc/ResizeDiskImage/) before reattempting the upgrade process. - (See **Additional Information** below for other options.) - - 7. After the upgrade process is finished, remove the cache file, if you - created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 8. Trim the new template (see **Compacting the Upgraded Template** for details - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-23 - - 9. (Optional) Remove the old default template. - - [user@dom0 ~]$ sudo yum remove qubes-template-fedora-21 - - -Summary: Upgrading the Minimal Fedora 21 Template to Fedora 23 --------------------------------------------------------------- - - [user@dom0 ~]$ qvm-clone fedora-21-minimal fedora-23-minimal - [user@dom0 ~]$ qvm-run -a fedora-23-minimal xterm - [user@fedora-23-minimal ~]$ su - - [root@fedora-23-minimal ~]# yum clean all - [user@fedora-23-minimal ~]# yum --releasever=23 --enablerepo=qubes*current-testing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-23-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Differences Between the Standard and Minimal Upgrade Procedures ---------------------------------------------------------------- - -The procedure for upgrading the minimal template (or any template based on the -minimal template) is the same as the procedure for the standard template above, -**with the following exceptions**: - - 1. `gnome-terminal` is not installed by default. Unless you've installed it - (or another terminal emulator), use `xterm`. (Of course, you can also use - `xterm` for the standard template, if you prefer.) - 2. `sudo` is not installed by default. Unless you've installed it, use `su` as - demonstrated above. (Of course, you can also use `su` for the standard - template, if you prefer.) - - -Compacting the Upgraded Template --------------------------------- - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -If you have at least `qubes-core-dom0-2.1.68` installed or are on Qubes R3.0, -you can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-23 - -If you do not have `qubes-core-dom0-2.1.68` or are on older Qubes version, you can -compact the `root.img` manually. To do this, you will need about 15GB (the -TemplateVM's max size + the actually used space there) free space in dom0. - - 1. Start the template and fill all the free space with zeros, for example - with: - - [user@fedora-23 ~]$ dd if=/dev/zero of=/var/tmp/zero - - 2. Wait for the "No space left on device" error. Then: - - [user@fedora-23 ~]$ rm -f /var/tmp/zero - - 3. Shut down the template and all VMs based on it. Then: - - [user@dom0 ~]$ cd /var/lib/qubes/vm-templates/fedora-23 - [user@dom0 ~]$ cp --sparse=always root.img root.img.new - [user@dom0 ~]$ mv root.img.new root.img - - -Additional Information ----------------------- - -As mentioned above, you may encounter the following `yum` error: - - At least X MB more space needed on the / filesystem. - -In this case, you have several options: - - 1. [Increase the TemplateVM's disk image size](/doc/resize-disk-image/). - This is the solution mentioned in the main instructions above. - 2. Delete files in order to free up space. One way to do this is by - uninstalling packages. You may then reinstall them again after you - finish the upgrade process, if desired). However, you may end up having to - increase the disk image size anyway (see previous option). - 3. Increase the `root.img` size with `qvm-grow-root`. It should be easy to - extend the `qvm-grow-root` tool in order to support PV (and not only HVM) - VMs. This is already done in R3.1. - 4. Do the upgrade in parts, e.g., by using package groups. (First upgrade - `@core` packages, then the rest.) - 5. Do not perform an in-place upgrade. Instead, simply download and install a - new template package, then redo all desired template modifications. - -With regard to the last option, here are some useful messages from the mailing -list which also apply to TemplateVM management and migration in general: - - * [Marek](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/dS1jbLRP9n8J) - * [Jason M](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/5PxDfI-RKAsJ) - -Upgrading to Fedora 22 ----------------------- - -You may choose to upgrade to Fedora 22 instead of Fedora 23. In that case, -simply replace version "23" with "22" in all above commands. - -Known issues with Fedora 23 ---------------------------- - -* [Graphical update tools (using PackageKit) does not work](https://github.com/QubesOS/qubes-issues/issues/982). -* [Dnf (new Fedora package manager) needs a lot of time to process repository metadata](https://bugzilla.redhat.com/show_bug.cgi?id=1227014), you may want to use `yum-deprecated` for now -* ["Terminal" shortcuts do not work because the desktop file in the VM has been renamed](https://github.com/QubesOS/qubes-issues/issues/1428). See the issue report for how to update your configuration to match. diff --git a/managing-os/templates/fedora/upgrade-23-to-24.md b/managing-os/templates/fedora/upgrade-23-to-24.md deleted file mode 100644 index a32f217b..00000000 --- a/managing-os/templates/fedora/upgrade-23-to-24.md +++ /dev/null @@ -1,238 +0,0 @@ ---- -layout: doc -title: Upgrading the Fedora 23 Template to Fedora 24 -permalink: /doc/template/fedora/upgrade-23-to-24/ -redirect_from: -- /doc/fedora-template-upgrade-23/ -- /en/doc/fedora-template-upgrade-23/ -- /doc/FedoraTemplateUpgrade23/ -- /wiki/FedoraTemplateUpgrade23/ ---- - -Upgrading the Fedora 23 Template -================================ - -Summary: Upgrading the Standard Fedora 23 Template to Fedora 24 ---------------------------------------------------------------- - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-24`). - - [user@dom0 ~]$ qvm-clone fedora-23 fedora-24 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-24 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-24 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-24 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-24 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-24 ~]$ sudo dnf clean all - [user@fedora-24 ~]$ sudo dnf --releasever=24 --setopt=cachedir=/mnt/removable distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-trim-template fedora-24 - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - - -Detailed: Upgrading the Standard Fedora 23 Template to Fedora 24 ----------------------------------------------------------------- - -These instructions will show you how to upgrade the standard Fedora 23 -TemplateVM to Fedora 24. The same general procedure may be used to upgrade any -template based on the standard Fedora 23 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-24`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-23 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-23 fedora-24 - [user@dom0 ~]$ qvm-run -a fedora-24 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-24 ~]$ sudo dnf clean all - [user@fedora-24 ~]$ sudo dnf --releasever=24 distro-sync - - **Note:** `dnf` might ask you to approve importing a new package signing - key. For example, you might see a prompt like this one: - - warning: /var/cache/dnf/fedora-d02ca361e1b58501/packages/python2-babel-2.3.4-1.fc24.noarch.rpm: Header V3 RSA/SHA256 Signature, key ID 81b46521: NOKEY - Importing GPG key 0x81B46521: - Userid : "Fedora (24) " - Fingerprint: 5048 BDBB A5E7 76E5 47B0 9CCC 73BD E983 81B4 6521 - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-24-x86_64 - Is this ok [y/N]: - - This key was already checked when it was installed (notice that the "From" - line refers to a location on your local disk), so you can safely say yes to - this prompt. - - **Note:** If you encounter no errors, proceed to step 4. If you do encounter - errors, see the next two points first. - - * If `dnf` 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-24 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-24 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-24 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-24 ~]$ sudo dnf clean all - [user@fedora-24 ~]$ sudo dnf --releasever=24 --setopt=cachedir=/mnt/removable distro-sync - - If this attempt is successful, proceed to step 4. - - * `dnf` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image][resize-disk-image] before reattempting the upgrade process. - (See [Additional Information] below for other options.) - - 4. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-24 - - 5. Remove the cache file, if you created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 6. Trim the new template (see [Compacting the Upgraded Template] for details - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-24 - - 7. (Recommended) Switch everything that was set to the old template to the new - template, e.g.: - - 1. Make the new template the default template: - - Qubes Manager --> Global settings --> Default template - - 2. Base AppVMs on the new template. In Qubes Manager, for each VM that is - currently based on `fedora-23` that you would like to base on - `fedora-24`, enter its VM settings and change the Template selection: - - Qubes Manager --> (Select a VM) --> VM settings --> Template - - 3. Base the [DispVM] template on the new template. - - If you have set the new template as your default template: - - [user@dom0 ~]$ qvm-create-default-dvm --default-template - - Otherwise: - - [user@dom0 ~]$ qvm-create-default-dvm fedora-24 - - 8. (Optional) Remove the old template. (Make sure to type `fedora-23`, not - `fedora-24`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-23 - - -Summary: Upgrading the Minimal Fedora 23 Template to Fedora 24 --------------------------------------------------------------- - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-24`). - - [user@dom0 ~]$ qvm-clone fedora-23-minimal fedora-24-minimal - [user@dom0 ~]$ qvm-run -a fedora-24-minimal xterm - [user@fedora-24-minimal ~]$ su - - [root@fedora-24-minimal ~]# dnf clean all - [user@fedora-24-minimal ~]# dnf --releasever=24 distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-24-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Differences Between the Standard and Minimal Upgrade Procedures ---------------------------------------------------------------- - -The procedure for upgrading the minimal template (or any template based on the -minimal template) is the same as the procedure for the standard template above, -**with the following exceptions**: - - 1. `gnome-terminal` is not installed by default. Unless you've installed it - (or another terminal emulator), use `xterm`. (Of course, you can also use - `xterm` for the standard template, if you prefer.) - 2. `sudo` is not installed by default. Unless you've installed it, use `su` as - demonstrated above. (Of course, you can also use `su` for the standard - template, if you prefer.) - - -Compacting the Upgraded Template --------------------------------- - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -You can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-24 - - -Upgrading StandaloneVMs ------------------------ - -The procedure for upgrading a StandaloneVM from Fedora 23 to Fedora 24 is the -same as for a TemplateVM, except that `qvm-trim-template` does not work on -StandaloneVMs. Instead, you should run the following command inside the -StandaloneVM in order to compact it: - - $ sudo fstrim -v -a - - -Additional Information ----------------------- - -As mentioned above, you may encounter the following `dnf` error: - - At least X MB more space needed on the / filesystem. - -In this case, you have several options: - - 1. [Increase the TemplateVM's disk image size][resize-disk-image]. - This is the solution mentioned in the main instructions above. - 2. Delete files in order to free up space. One way to do this is by - uninstalling packages. You may then reinstall them again after you - finish the upgrade process, if desired). However, you may end up having to - increase the disk image size anyway (see previous option). - 3. Increase the `root.img` size with `qvm-grow-root`. - 4. Do the upgrade in parts, e.g., by using package groups. (First upgrade - `@core` packages, then the rest.) - 5. Do not perform an in-place upgrade. Instead, simply download and install a - new template package, then redo all desired template modifications. - - With regard to the last option, here are some useful messages from the - mailing list which also apply to TemplateVM management and migration in - general: - - * [Marek](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/dS1jbLRP9n8J) - * [Jason M](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/5PxDfI-RKAsJ) - - -[resize-disk-image]: /doc/resize-disk-image/ -[Additional Information]: #additional-information -[Compacting the Upgraded Template]: #compacting-the-upgraded-template -[DispVM]: /doc/disposablevm/ diff --git a/managing-os/templates/fedora/upgrade-24-to-25.md b/managing-os/templates/fedora/upgrade-24-to-25.md deleted file mode 100644 index c3923f68..00000000 --- a/managing-os/templates/fedora/upgrade-24-to-25.md +++ /dev/null @@ -1,241 +0,0 @@ ---- -layout: doc -title: Upgrading the Fedora 24 Template to Fedora 25 -permalink: /doc/template/fedora/upgrade-24-to-25/ -redirect_from: -- /doc/fedora-template-upgrade-24/ -- /en/doc/fedora-template-upgrade-24/ -- /doc/FedoraTemplateUpgrade24/ -- /wiki/FedoraTemplateUpgrade24/ ---- - -Upgrading the Fedora 24 Template -================================ - -This instruction is about upgrading Fedora 24 to Fedora 25 template. The same -instruction can be used to upgrade Fedora 23 to Fedora 25 - simply start with -cloning fedora-23 instead of fedora-24. - -Summary: Upgrading the Standard Fedora 24 Template to Fedora 25 ---------------------------------------------------------------- - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-25`). - - [user@dom0 ~]$ qvm-clone fedora-24 fedora-25 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-25 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-25 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-25 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-25 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-25 ~]$ sudo dnf clean all - [user@fedora-25 ~]$ sudo dnf --releasever=25 --setopt=cachedir=/mnt/removable distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-trim-template fedora-25 - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - -Detailed: Upgrading the Standard Fedora 24 Template to Fedora 25 ----------------------------------------------------------------- - -These instructions will show you how to upgrade the standard Fedora 24 -TemplateVM to Fedora 25. The same general procedure may be used to upgrade any -template based on the standard Fedora 24 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-25`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-24 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-24 fedora-25 - [user@dom0 ~]$ qvm-run -a fedora-25 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-25 ~]$ sudo dnf clean all - [user@fedora-25 ~]$ sudo dnf --releasever=25 distro-sync - - **Note:** `dnf` might ask you to approve importing a new package signing - key. For example, you might see a prompt like this one: - - warning: /var/cache/dnf/fedora-d02ca361e1b58501/packages/python2-babel-2.3.4-1.fc25.noarch.rpm: Header V3 RSA/SHA256 Signature, key ID 8fdb19c98: NOKEY - Importing GPG key 0x81B46521: - Userid : "Fedora (25) " - Fingerprint: C437 DCCD 558A 66A3 7D6F 4372 4089 D8F2 FDB1 9C98 - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-25-x86_64 - Is this ok [y/N]: - - This key was already checked when it was installed (notice that the "From" - line refers to a location on your local disk), so you can safely say yes to - this prompt. - - **Note:** If you encounter no errors, proceed to step 4. If you do encounter - errors, see the next two points first. - - * If `dnf` 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-25 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-25 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-25 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-25 ~]$ sudo dnf clean all - [user@fedora-25 ~]$ sudo dnf --releasever=25 --setopt=cachedir=/mnt/removable distro-sync - - If this attempt is successful, proceed to step 4. - - * `dnf` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image][resize-disk-image] before reattempting the upgrade process. - (See [Additional Information] below for other options.) - - 4. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-25 - - 5. Remove the cache file, if you created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 6. Trim the new template (see [Compacting the Upgraded Template] for details - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-25 - - 7. (Recommended) Switch everything that was set to the old template to the new - template, e.g.: - - 1. Make the new template the default template: - - Qubes Manager --> Global settings --> Default template - - 2. Base AppVMs on the new template. In Qubes Manager, for each VM that is - currently based on `fedora-24` that you would like to base on - `fedora-25`, enter its VM settings and change the Template selection: - - Qubes Manager --> (Select a VM) --> VM settings --> Template - - 3. Base the [DispVM] template on the new template. - - If you have set the new template as your default template: - - [user@dom0 ~]$ qvm-create-default-dvm --default-template - - Otherwise: - - [user@dom0 ~]$ qvm-create-default-dvm fedora-25 - - 8. (Optional) Remove the old template. (Make sure to type `fedora-24`, not - `fedora-25`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-24 - - -Summary: Upgrading the Minimal Fedora 24 Template to Fedora 25 --------------------------------------------------------------- - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-25`). - - [user@dom0 ~]$ qvm-clone fedora-24-minimal fedora-25-minimal - [user@dom0 ~]$ qvm-run -a fedora-25-minimal xterm - [user@fedora-25-minimal ~]$ su - - [root@fedora-25-minimal ~]# dnf clean all - [user@fedora-25-minimal ~]# dnf --releasever=25 distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-25-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Differences Between the Standard and Minimal Upgrade Procedures ---------------------------------------------------------------- - -The procedure for upgrading the minimal template (or any template based on the -minimal template) is the same as the procedure for the standard template above, -**with the following exceptions**: - - 1. `gnome-terminal` is not installed by default. Unless you've installed it - (or another terminal emulator), use `xterm`. (Of course, you can also use - `xterm` for the standard template, if you prefer.) - 2. `sudo` is not installed by default. Unless you've installed it, use `su` as - demonstrated above. (Of course, you can also use `su` for the standard - template, if you prefer.) - - -Compacting the Upgraded Template --------------------------------- - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -You can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-25 - - -Upgrading StandaloneVMs ------------------------ - -The procedure for upgrading a StandaloneVM from Fedora 24 to Fedora 25 is the -same as for a TemplateVM, except that `qvm-trim-template` does not work on -StandaloneVMs. Instead, you should run the following command inside the -StandaloneVM in order to compact it: - - $ sudo fstrim -v -a - - -Additional Information ----------------------- - -As mentioned above, you may encounter the following `dnf` error: - - At least X MB more space needed on the / filesystem. - -In this case, you have several options: - - 1. [Increase the TemplateVM's disk image size][resize-disk-image]. - This is the solution mentioned in the main instructions above. - 2. Delete files in order to free up space. One way to do this is by - uninstalling packages. You may then reinstalling them again after you - finish the upgrade process, if desired). However, you may end up having to - increase the disk image size anyway (see previous option). - 3. Increase the `root.img` size with `qvm-grow-root`. - 4. Do the upgrade in parts, e.g., by using package groups. (First upgrade - `@core` packages, then the rest.) - 5. Do not perform an in-place upgrade. Instead, simply download and install a - new template package, then redo all desired template modifications. - - With regard to the last option, here are some useful messages from the - mailing list which also apply to TemplateVM management and migration in - general: - - * [Marek](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/dS1jbLRP9n8J) - * [Jason M](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/5PxDfI-RKAsJ) - - -[resize-disk-image]: /doc/resize-disk-image/ -[Additional Information]: #additional-information -[Compacting the Upgraded Template]: #compacting-the-upgraded-template -[DispVM]: /doc/disposablevm/ diff --git a/managing-os/templates/fedora/upgrade-25-to-26.md b/managing-os/templates/fedora/upgrade-25-to-26.md deleted file mode 100644 index dac3b269..00000000 --- a/managing-os/templates/fedora/upgrade-25-to-26.md +++ /dev/null @@ -1,386 +0,0 @@ ---- -layout: doc -title: Upgrading the Fedora 25 Template to Fedora 26 -permalink: /doc/template/fedora/upgrade-25-to-26/ -redirect_from: -- /doc/fedora-template-upgrade-25/ -- /en/doc/fedora-template-upgrade-25/ -- /doc/FedoraTemplateUpgrade25/ -- /wiki/FedoraTemplateUpgrade25/ ---- - -Upgrading the Fedora 25 Template to Fedora 26 -============================================= - -This page provides instructions for performing an in-place upgrade of an -installed Fedora 25 [TemplateVM] to Fedora 26. If you wish to install a new, -unmodified Fedora 26 template instead of upgrading a template that is already -installed in your system, please see the [Fedora TemplateVM] page instead. - -These instructions can also be used to upgrade a Fedora 24 TemplateVM to -Fedora 26. Simply start by cloning `fedora-24` instead of `fedora-25` in the -instructions below. - -Qubes 3.2 Instructions ----------------------- - -### Summary: Upgrading the Standard Fedora 25 Template to Fedora 26 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-26`). - - [user@dom0 ~]$ qvm-clone fedora-25 fedora-26 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-26 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-26 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-26 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-26 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-26 ~]$ sudo dnf clean all - [user@fedora-26 ~]$ sudo dnf --releasever=26 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-trim-template fedora-26 - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - - -### Detailed: Upgrading the Standard Fedora 25 Template to Fedora 26 ### - -These instructions will show you how to upgrade the standard Fedora 25 -TemplateVM to Fedora 26. The same general procedure may be used to upgrade any -template based on the standard Fedora 25 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-26`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-25 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-25 fedora-26 - [user@dom0 ~]$ qvm-run -a fedora-26 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-26 ~]$ sudo dnf clean all - [user@fedora-26 ~]$ sudo dnf --releasever=26 distro-sync --best --allowerasing - - **Note:** `dnf` might ask you to approve importing a new package signing - key. For example, you might see a prompt like this one: - - warning: /var/cache/dnf/fedora-d02ca361e1b58501/packages/python2-babel-2.3.4-1.fc26.noarch.rpm: Header V3 RSA/SHA256 Signature, key ID 64dab85d: NOKEY - Importing GPG key 0x64DAB85D: - Userid : "Fedora (26) " - Fingerprint: E641 850B 77DF 4353 78D1 D7E2 812A 6B4B 64DA B85D - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-26-x86_64 - Is this ok [y/N]: - - This key was already checked when it was installed (notice that the "From" - line refers to a location on your local disk), so you can safely say yes to - this prompt. - - **Note:** If you encounter no errors, proceed to step 4. If you do encounter - errors, see the next two points first. - - * If `dnf` 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-26 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-26 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-26 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-26 ~]$ sudo dnf clean all - [user@fedora-26 ~]$ sudo dnf --releasever=26 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - - If this attempt is successful, proceed to step 4. - - * `dnf` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image][resize-disk-image] before reattempting the upgrade process. - (See [Additional Information] below for other options.) - - 4. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-26 - - 5. Remove the cache file, if you created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 6. Trim the new template (see [Compacting the Upgraded Template] for details - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-26 - - 7. (Recommended) Switch everything that was set to the old template to the new - template, e.g.: - - 1. Make the new template the default template: - - Qubes Manager --> Global settings --> Default template - - 2. Base AppVMs on the new template. In Qubes Manager, for each VM that is - currently based on `fedora-25` that you would like to base on - `fedora-26`, enter its VM settings and change the Template selection: - - Qubes Manager --> (Select a VM) --> VM settings --> Template - - 3. Base the [DispVM] template on the new template. - - If you have set the new template as your default template: - - [user@dom0 ~]$ qvm-create-default-dvm --default-template - - Otherwise: - - [user@dom0 ~]$ qvm-create-default-dvm fedora-26 - - 8. (Optional) Remove the old template. (Make sure to type `fedora-25`, not - `fedora-26`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-25 - - -### Compacting the Upgraded Template ### - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -You can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-26 - - -### Upgrading StandaloneVMs ### - -The procedure for upgrading a StandaloneVM from Fedora 25 to Fedora 26 is the -same as for a TemplateVM, except that `qvm-trim-template` does not work on -StandaloneVMs. Instead, you should run the following command inside the -StandaloneVM in order to compact it: - - $ sudo fstrim -v -a - - -### Summary: Upgrading the Minimal Fedora 25 Template to Fedora 26 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-26`). - - [user@dom0 ~]$ qvm-clone fedora-25-minimal fedora-26-minimal - [user@dom0 ~]$ qvm-run -u root -a fedora-26-minimal xterm - [root@fedora-26-minimal ~]# dnf clean all - [user@fedora-26-minimal ~]# dnf --releasever=26 --best --allowerasing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-26-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Qubes 4.0 Instructions ----------------------- - -### Summary: Upgrading the Standard Fedora 25 Template to Fedora 26 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-26`). - - [user@dom0 ~]$ qvm-clone fedora-25 fedora-26 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-26 gnome-terminal - [user@dom0 ~]$ dev=$(sudo losetup -f --show /var/tmp/template-upgrade-cache.img) - [user@dom0 ~]$ qvm-block attach fedora-26 dom0:${dev##*/} - [user@fedora-26 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-26 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-26 ~]$ sudo dnf clean all - [user@fedora-26 ~]$ sudo dnf --releasever=26 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - [user@fedora-26 ~]$ sudo fstrim -v / - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - - -### Detailed: Upgrading the Standard Fedora 25 Template to Fedora 26 ### - -These instructions will show you how to upgrade the standard Fedora 25 -TemplateVM to Fedora 26. The same general procedure may be used to upgrade any -template based on the standard Fedora 25 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-26`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-25 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-25 fedora-26 - [user@dom0 ~]$ qvm-run -a fedora-26 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-26 ~]$ sudo dnf clean all - [user@fedora-26 ~]$ sudo dnf --releasever=26 distro-sync --best --allowerasing - - **Note:** `dnf` might ask you to approve importing a new package signing - key. For example, you might see a prompt like this one: - - warning: /var/cache/dnf/fedora-d02ca361e1b58501/packages/python2-babel-2.3.4-1.fc26.noarch.rpm: Header V3 RSA/SHA256 Signature, key ID 64dab85d: NOKEY - Importing GPG key 0x64DAB85D: - Userid : "Fedora (26) " - Fingerprint: E641 850B 77DF 4353 78D1 D7E2 812A 6B4B 64DA B85D - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-26-x86_64 - Is this ok [y/N]: - - This key was already checked when it was installed (notice that the "From" - line refers to a location on your local disk), so you can safely say yes to - this prompt. - - **Note:** If you encounter no errors, proceed to step 4. If you do encounter - errors, see the next two points first. - - * If `dnf` 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ dev=$(sudo losetup -f --show /var/tmp/template-upgrade-cache.img) - [user@dom0 ~]$ qvm-block attach fedora-26 dom0:${dev##*/} - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-26 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-26 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-26 ~]$ sudo dnf clean all - [user@fedora-26 ~]$ sudo dnf --releasever=26 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - - If this attempt is successful, proceed to step 4. - - * `dnf` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image][resize-disk-image] before reattempting the upgrade process. - (See [Additional Information] below for other options.) - - 4. Trim the new template. - - [user@fedora-26 ~]$ sudo fstrim -v / - - 5. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-26 - - 6. Remove the cache file, if you created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 7. (Recommended) Switch everything that was set to the old template to the new - template, e.g.: - - 1. Make the new template the default template: - - Applications Menu --> System Tools --> Qubes Global Settings --> Default template - - 2. Base AppVMs on the new template. In Qubes Manager, for each VM that is - currently based on `fedora-25` that you would like to base on - `fedora-26`, enter its VM settings and change the Template selection: - - Applications Menu --> (select a VM) --> VM settings --> Template - - 3. Base the [DispVM] template on the new template. - - [user@dom0 ~]$ qvm-create -l red -t fedora-26 fedora-26-dvm - [user@dom0 ~]$ qvm-prefs fedora-26-dvm template_for_dispvms True - [user@dom0 ~]$ qvm-features fedora-26-dvm appmenus-dispvm 1 - [user@dom0 ~]$ qubes-prefs default-dispvm fedora-26-dvm - - 8. (Optional) Remove the old template. (Make sure to type `fedora-25`, not - `fedora-26`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-25 - - -### Upgrading StandaloneVMs ### - -The procedure for upgrading a StandaloneVM from Fedora 25 to Fedora 26 is the -same as for a TemplateVM. - - -### Summary: Upgrading the Minimal Fedora 25 Template to Fedora 26 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-26`). - - [user@dom0 ~]$ qvm-clone fedora-25-minimal fedora-26-minimal - [user@dom0 ~]$ qvm-run -u root -a fedora-26-minimal xterm - [root@fedora-26-minimal ~]# dnf clean all - [user@fedora-26-minimal ~]# dnf --releasever=26 --best --allowerasing distro-sync - [user@fedora-26-minimal ~]# fstrim -v / - - (Shut down TemplateVM by any normal means.) - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Additional Information ----------------------- - -As mentioned above, you may encounter the following `dnf` error: - - At least X MB more space needed on the / filesystem. - -In this case, you have several options: - - 1. [Increase the TemplateVM's disk image size][resize-disk-image]. - This is the solution mentioned in the main instructions above. - 2. Delete files in order to free up space. One way to do this is by - uninstalling packages. You may then reinstalling them again after you - finish the upgrade process, if desired). However, you may end up having to - increase the disk image size anyway (see previous option). - 3. Increase the `root.img` size with `qvm-grow-root`. - 4. Do the upgrade in parts, e.g., by using package groups. (First upgrade - `@core` packages, then the rest.) - 5. Do not perform an in-place upgrade. Instead, simply download and install a - new template package, then redo all desired template modifications. - - With regard to the last option, here are some useful messages from the - mailing list which also apply to TemplateVM management and migration in - general: - - * [Marek](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/dS1jbLRP9n8J) - * [Jason M](https://groups.google.com/d/msg/qubes-users/mCXkxlACILQ/5PxDfI-RKAsJ) - - -[TemplateVM]: /doc/templates/ -[Fedora TemplateVM]: /doc/templates/fedora/ -[resize-disk-image]: /doc/resize-disk-image/ -[Additional Information]: #additional-information -[Compacting the Upgraded Template]: #compacting-the-upgraded-template -[DispVM]: /doc/disposablevm/ - diff --git a/managing-os/templates/fedora/upgrade-26-to-27.md b/managing-os/templates/fedora/upgrade-26-to-27.md index 6c23c804..bdb3a863 100644 --- a/managing-os/templates/fedora/upgrade-26-to-27.md +++ b/managing-os/templates/fedora/upgrade-26-to-27.md @@ -31,161 +31,8 @@ For most users, this behavior should not cause a problem, since a TemplateVM in However, if you wish to have the RPM Fusion repo definitions after upgrading in a TemplateVM in which they are currently disabled, you may wish to temporarily enable them prior to upgrading or manually create, copy, or download them after upgrading. -Qubes 3.2 Instructions ----------------------- - -### Summary: Upgrading the Standard Fedora 26 Template to Fedora 27 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-27`). - - [user@dom0 ~]$ qvm-clone fedora-26 fedora-27 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-27 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-27 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-27 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-27 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-27 ~]$ sudo dnf clean all - [user@fedora-27 ~]$ sudo dnf --releasever=27 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-trim-template fedora-27 - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - - -### Detailed: Upgrading the Standard Fedora 26 Template to Fedora 27 ### - -These instructions will show you how to upgrade the standard Fedora 26 -TemplateVM to Fedora 27. The same general procedure may be used to upgrade any -template based on the standard Fedora 26 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-27`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-26 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-26 fedora-27 - [user@dom0 ~]$ qvm-run -a fedora-27 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-27 ~]$ sudo dnf clean all - [user@fedora-27 ~]$ sudo dnf --releasever=27 distro-sync --best --allowerasing - - **Note:** `dnf` might ask you to approve importing a new package signing - key. For example, you might see a prompt like this one: - - warning: /var/cache/dnf/fedora-d02ca361e1b58501/packages/python2-babel-2.3.4-1.fc27.noarch.rpm: Header V3 RSA/SHA256 Signature, key ID f5282ee4: NOKEY - Importing GPG key 0xF5282EE4: - Userid : "Fedora (27) " - Fingerprint: 860E 19B0 AFA8 00A1 7518 81A6 F55E 7430 F528 2EE4 - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-27-x86_64 - Is this ok [y/N]: - - This key was already checked when it was installed (notice that the "From" - line refers to a location on your local disk), so you can safely say yes to - this prompt. - - **Note:** If you encounter no errors, proceed to step 4. If you do encounter - errors, see the next two points first. - - * If `dnf` 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-27 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-27 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-27 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-27 ~]$ sudo dnf clean all - [user@fedora-27 ~]$ sudo dnf --releasever=27 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - - If this attempt is successful, proceed to step 4. - - * `dnf` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image][resize-disk-image] before reattempting the upgrade process. - (See [Additional Information] below for other options.) - - 4. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-27 - - 5. Remove the cache file, if you created one. - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - - 6. Trim the new template (see [Compacting the Upgraded Template] for details - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-27 - - 7. (Recommended) [Switch everything that was set to the old template to the new - template.][switching-3.2] - - 8. (Optional) Remove the old template. (Make sure to type `fedora-26`, not - `fedora-27`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-26 - - -### Compacting the Upgraded Template ### - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -You can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-27 - - -### Upgrading StandaloneVMs ### - -The procedure for upgrading a StandaloneVM from Fedora 26 to Fedora 27 is the -same as for a TemplateVM, except that `qvm-trim-template` does not work on -StandaloneVMs. Instead, you should run the following command inside the -StandaloneVM in order to compact it: - - $ sudo fstrim -v -a - - -### Summary: Upgrading the Minimal Fedora 26 Template to Fedora 27 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-27`). - - [user@dom0 ~]$ qvm-clone fedora-26-minimal fedora-27-minimal - [user@dom0 ~]$ qvm-run -u root -a fedora-27-minimal xterm - [root@fedora-27-minimal ~]# dnf clean all - [user@fedora-27-minimal ~]# dnf --releasever=27 --best --allowerasing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-27-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Qubes 4.0 Instructions ----------------------- +Instructions +------------ ### Summary: Upgrading the Standard Fedora 26 Template to Fedora 27 ### @@ -292,7 +139,7 @@ should be entered (`@dom0` or `@fedora-27`). [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img 7. (Recommended) [Switch everything that was set to the old template to the new - template.][switching-4.0] + template.][switching] 8. (Optional) Remove the old template. (Make sure to type `fedora-26`, not `fedora-27`.) @@ -356,7 +203,6 @@ In this case, you have several options: [resize-disk-image]: /doc/resize-disk-image/ [Additional Information]: #additional-information [Compacting the Upgraded Template]: #compacting-the-upgraded-template -[switching-3.2]: /doc/templates/#how-to-switch-templates-32 -[switching-4.0]: /doc/templates/#how-to-switch-templates-40 +[switching]: /doc/templates/#how-to-switch-templates [DispVM]: /doc/disposablevm/ diff --git a/managing-os/templates/fedora/upgrade-27-to-28.md b/managing-os/templates/fedora/upgrade-27-to-28.md index cb164876..88283df6 100644 --- a/managing-os/templates/fedora/upgrade-27-to-28.md +++ b/managing-os/templates/fedora/upgrade-27-to-28.md @@ -50,165 +50,8 @@ To work around this error: (This should automatically upgrade the other excluded packages too.) -Qubes 3.2 Instructions ----------------------- - -### Summary: Upgrading the Standard Fedora 27 Template to Fedora 28 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-28`). - - [user@dom0 ~]$ qvm-clone fedora-27 fedora-28 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-28 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-28 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-28 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-28 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-28 ~]$ sudo dnf clean all - [user@fedora-28 ~]$ sudo dnf --releasever=28 --setopt=cachedir=/mnt/removable --best --allowerasing -x python2-tornado distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-trim-template fedora-28 - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - - -### Detailed: Upgrading the Standard Fedora 27 Template to Fedora 28 ### - -These instructions will show you how to upgrade the standard Fedora 27 -TemplateVM to Fedora 28. The same general procedure may be used to upgrade any -template based on the standard Fedora 27 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-28`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-27 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-27 fedora-28 - [user@dom0 ~]$ qvm-run -a fedora-28 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-28 ~]$ sudo dnf clean all - [user@fedora-28 ~]$ sudo dnf --releasever=28 distro-sync --best --allowerasing - - **Note:** `dnf` might ask you to approve importing a new package signing - key. For example, you might see a prompt like this one: - - warning: /var/cache/dnf/fedora-d02ca361e1b58501/packages/python2-babel-2.3.4-1.fc28.noarch.rpm: Header V3 RSA/SHA256 Signature, key ID 9db62fb1: NOKEY - Importing GPG key 0x9DB62FB1: - Userid : "Fedora (28) " - Fingerprint: 128C F232 A937 1991 C8A6 5695 E08E 7E62 9DB6 2FB1 - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-x86_64 - Is this ok [y/N]: - - This key was already checked when it was installed (notice that the "From" - line refers to a location on your local disk), so you can safely say yes to - this prompt. - - **Note:** If you encounter no errors, proceed to step 4. If you do encounter - errors, see the next two points first. - - * If `dnf` 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. - - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-block -A fedora-28 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-28 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-28 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-28 ~]$ sudo dnf clean all - [user@fedora-28 ~]$ sudo dnf --releasever=28 --setopt=cachedir=/mnt/removable --best --allowerasing distro-sync - - If this attempt is successful, proceed to step 4. - - * `dnf` may complain: - - At least X MB more space needed on the / filesystem. - - In this case, one option is to [resize the TemplateVM's disk - image][resize-disk-image] before reattempting the upgrade process. - (See [Additional Information] below for other options.) - - 4. Check that you are on the correct (new) fedora release. - - [user@fedora-28 ~]$ cat /etc/fedora-release - - 5. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-28 - - 6. 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 - and other options). - - [user@dom0 ~]$ qvm-trim-template fedora-28 - - 8. (Recommended) [Switch everything that was set to the old template to the new - template.][switching-3.2] - - 9. (Optional) Remove the old template. (Make sure to type `fedora-27`, not - `fedora-28`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-27 - - -### Compacting the Upgraded Template ### - -Neither `fstrim` nor the `discard` mount option works on the TemplateVM's root -filesystem, so when a file is removed in the template, space is not freed in -dom0. This means that the template will use about twice as much space as is -really necessary after upgrading. - -You can use the `qvm-trim-template` tool: - - [user@dom0 ~]$ qvm-trim-template fedora-28 - - -### Upgrading StandaloneVMs ### - -The procedure for upgrading a StandaloneVM from Fedora 27 to Fedora 28 is the -same as for a TemplateVM, except that `qvm-trim-template` does not work on -StandaloneVMs. Instead, you should run the following command inside the -StandaloneVM in order to compact it: - - $ sudo fstrim -v -a - - -### Summary: Upgrading the Minimal Fedora 27 Template to Fedora 28 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-28`). - - [user@dom0 ~]$ qvm-clone fedora-27-minimal fedora-28-minimal - [user@dom0 ~]$ qvm-run -u root -a fedora-28-minimal xterm - [root@fedora-28-minimal ~]# dnf clean all - [user@fedora-28-minimal ~]# dnf --releasever=28 --best --allowerasing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-28-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - -Qubes 4.0 Instructions ----------------------- +Instructions +------------ ### Summary: Upgrading the Standard Fedora 27 Template to Fedora 28 ### @@ -319,7 +162,7 @@ should be entered (`@dom0` or `@fedora-28`). [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img 8. (Recommended) [Switch everything that was set to the old template to the new - template.][switching-4.0] + template.][switching] 9. (Optional) Remove the old template. (Make sure to type `fedora-27`, not `fedora-28`.) @@ -383,7 +226,6 @@ In this case, you have several options: [resize-disk-image]: /doc/resize-disk-image/ [Additional Information]: #additional-information [Compacting the Upgraded Template]: #compacting-the-upgraded-template -[switching-3.2]: /doc/templates/#how-to-switch-templates-32 -[switching-4.0]: /doc/templates/#how-to-switch-templates-40 +[switching]: /doc/templates/#how-to-switch-templates [DispVM]: /doc/disposablevm/ diff --git a/managing-os/templates/fedora/upgrade-28-to-29.md b/managing-os/templates/fedora/upgrade-28-to-29.md index 73d1581f..05cfe1b8 100644 --- a/managing-os/templates/fedora/upgrade-28-to-29.md +++ b/managing-os/templates/fedora/upgrade-28-to-29.md @@ -31,8 +31,8 @@ For most users, this behavior should not cause a problem, since a TemplateVM in However, if you wish to have the RPM Fusion repo definitions after upgrading in a TemplateVM in which they are currently disabled, you may wish to temporarily enable them prior to upgrading or manually create, copy, or download them after upgrading. -Qubes 4.0 Instructions ----------------------- +Instructions +------------ ### Summary: Upgrading the Standard Fedora 28 Template to Fedora 29 ### @@ -143,7 +143,7 @@ should be entered (`@dom0` or `@fedora-29`). [user@dom0 ~]$ rm /var/tmp/template-upgrade-cache.img 8. (Recommended) [Switch everything that was set to the old template to the new - template.][switching-4.0] + template.][switching] 9. (Optional) Remove the old template. (Make sure to type `fedora-28`, not `fedora-29`.) @@ -174,11 +174,6 @@ same as for a TemplateVM. described for the standard template above.) -Qubes 3.2 ---------- - -Fedora 29 is currently not supported on Qubes 3.2. Since official support for Qubes 3.2 ends (2019-03-28) before end of support for Fedora 28 (not earlier than 2019-05-30), Qubes team does not plan to add support for Fedora 29 to Qubes 3.2. - Additional Information ---------------------- @@ -212,7 +207,6 @@ In this case, you have several options: [resize-disk-image]: /doc/resize-disk-image/ [Additional Information]: #additional-information [Compacting the Upgraded Template]: #compacting-the-upgraded-template -[switching-3.2]: /doc/templates/#how-to-switch-templates-32 -[switching-4.0]: /doc/templates/#how-to-switch-templates-40 +[switching]: /doc/templates/#how-to-switch-templates [DispVM]: /doc/dispvm/ diff --git a/managing-os/windows/windows-tools.md b/managing-os/windows/windows-tools.md index 30ace52d..e884cabf 100644 --- a/managing-os/windows/windows-tools.md +++ b/managing-os/windows/windows-tools.md @@ -14,7 +14,7 @@ Qubes Windows Tools Qubes Windows Tools are a set of programs and drivers that provide integration of Windows AppVMs with the rest of the Qubes system. Currently the following features are available for Windows VMs after installation of those tools: -- Seamless GUI mode that integrates apps windows onto the common Qubes trusted desktop (available on Qubes R2 Beta 3 and later) +- Seamless GUI mode that integrates apps windows onto the common Qubes trusted desktop - Support for [secure clipboard copy/paste](/doc/copy-paste/) between the Windows VM and other AppVMs - Support for [secure file exchange](/doc/copying-files/) between the Windows VM and other AppVMs - Support for qvm-run and generic qrexec for the Windows VM (e.g. ability to run custom service within/from the Windows VM) @@ -72,9 +72,9 @@ qvm-start lab-win7 --install-windows-tools Once the Windows VM boots, a CDROM should appear in the 'My Computer' menu (typically as `D:`) with a setup program in its main directory. -After successful installation, the Windows VM must be shut down and started again, possibly a couple of times (see [this page](/doc/windows-tools-3/) for detailed configuration options). +After successful installation, the Windows VM must be shut down and started again, possibly a couple of times. -Qubes (R2 Beta 3 and later releases) will automatically detect the tools has been installed in the VM and will set appropriate properties for the VM, such as `qrexec_installed`, `guiagent_installed`, and `default_user`. This can be verified (but is not required) using qvm-prefs command: +Qubes will automatically detect the tools has been installed in the VM and will set appropriate properties for the VM, such as `qrexec_installed`, `guiagent_installed`, and `default_user`. This can be verified (but is not required) using qvm-prefs command: ~~~ qvm-prefs @@ -86,8 +86,8 @@ NOTE: it is recommended to increase the default value of Windows VM's `qrexec_ti qvm-prefs -s qrexec_timeout 300 ~~~ -Using Windows AppVMs in seamless mode (Qubes R2 Beta 3 and later) ------------------------------------------------------------------ +Using Windows AppVMs in seamless mode +------------------------------------- Once you start a Windows-based AppVM with Qubes Tools installed, you can easily start individual applications from the VM (note the `-a` switch used here, which will auto-start the VM if it is not running): @@ -120,8 +120,8 @@ Changing between seamless and full desktop mode You can switch between seamless and "full desktop" mode for Windows HVMs in their settings in Qubes Manager. The latter is the default. -Using template-based Windows AppVMs (Qubes R2 Beta 3 and later) ---------------------------------------------------------------- +Using template-based Windows AppVMs +----------------------------------- Qubes allows HVM VMs to share a common root filesystem from a select Template VM, just like it is done for Linux AppVMs. This mode is not limited to Windows AppVMs, and can be used for any HVM (e.g. FreeBSD running in a HVM). In order to create a HVM TemplateVM one can use the following command: @@ -142,7 +142,3 @@ Once the template has been created and installed it is easy to create AppVMs bas qvm-create --hvm --template --label