diff --git a/managing-os/templates/fedora/upgrade-28-to-29.md b/managing-os/templates/fedora/upgrade-28-to-29.md index bec5dff8..73d1581f 100644 --- a/managing-os/templates/fedora/upgrade-28-to-29.md +++ b/managing-os/templates/fedora/upgrade-28-to-29.md @@ -31,183 +31,6 @@ 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. -Workaround for `python2-xcffib` upgrade error ---------------------------------------------- - -When attempting to upgrade from Fedora 26 or 28 to Fedora 29, you may encounter an error similar to this: - - Error: Transaction check error: - file /usr/lib/python2.7/site-packages/xcffib-0.5.1-py2.7.egg-info/PKG-INFO from install of python2-xcffib-0.5.1-5.fc29.noarch conflicts with file from package python-xcffib-0.5.1-1.fc26.noarch - file /usr/lib/python2.7/site-packages/xcffib/_ffi.pyc from install of python2-xcffib-0.5.1-5.fc29.noarch conflicts with file from package python-xcffib-0.5.1-1.fc26.noarch - file /usr/lib/python2.7/site-packages/xcffib/_ffi.pyo from install of python2-xcffib-0.5.1-5.fc29.noarch conflicts with file from package python-xcffib-0.5.1-1.fc26.noarch - file /usr/lib/python2.7/site-packages/xcffib/xinput.pyc from install of python2-xcffib-0.5.1-5.fc29.noarch conflicts with file from package python-xcffib-0.5.1-1.fc26.noarch - file /usr/lib/python2.7/site-packages/xcffib/xinput.pyo from install of python2-xcffib-0.5.1-5.fc29.noarch conflicts with file from package python-xcffib-0.5.1-1.fc26.noarch - -To work around this error: - -1. Upgrade while excluding the problematic packages by using `-x python2-xcffib -x qubes-gui-vm -x qubes-gui-agent`. -2. Upgrade `python2-xcffib` using `sudo dnf swap python-xcffib python2-xcffib`. - (This should automatically upgrade the other excluded packages too.) - - -Qubes 3.2 Instructions ----------------------- - -### Summary: Upgrading the Standard Fedora 28 Template to Fedora 29 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-29`). - - [user@dom0 ~]$ qvm-clone fedora-28 fedora-29 - [user@dom0 ~]$ truncate -s 5GB /var/tmp/template-upgrade-cache.img - [user@dom0 ~]$ qvm-run -a fedora-29 gnome-terminal - [user@dom0 ~]$ qvm-block -A fedora-29 dom0:/var/tmp/template-upgrade-cache.img - [user@fedora-29 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-29 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-29 ~]$ sudo dnf clean all - [user@fedora-29 ~]$ sudo dnf --releasever=29 --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-29 - -(Optional cleanup: Switch everything over to the new template and delete the old -one. See instructions below for details.) - - -### Detailed: Upgrading the Standard Fedora 28 Template to Fedora 29 ### - -These instructions will show you how to upgrade the standard Fedora 28 -TemplateVM to Fedora 29. The same general procedure may be used to upgrade any -template based on the standard Fedora 28 template. - -**Note:** The command-line prompt on each line indicates where each command -should be entered (`@dom0` or `@fedora-29`). - - 1. Ensure the existing template is not running. - - [user@dom0 ~]$ qvm-shutdown fedora-28 - - 2. Clone the existing template and start a terminal in the new template. - - [user@dom0 ~]$ qvm-clone fedora-28 fedora-29 - [user@dom0 ~]$ qvm-run -a fedora-29 gnome-terminal - - 3. Attempt the upgrade process in the new template. - - [user@fedora-29 ~]$ sudo dnf clean all - [user@fedora-29 ~]$ sudo dnf --releasever=29 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: /mnt/removable/updates-0b4cc238d1aa4ffe/packages/kernel-4.18.17-300.fc29.x86_64.rpm: Header V3 RSA/SHA256 Signature, key ID 429476b4: NOKEY - Importing GPG key 0x429476B4: - Userid : "Fedora 29 (29) " - Fingerprint: 5A03 B4DD 8254 ECA0 2FDA 1637 A20A A56B 4294 76B4 - From : /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-x86_64 - Is this ok [y/N]: y - - - 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-29 dom0:/var/tmp/template-upgrade-cache.img - - Then reattempt the upgrade process, but this time use the virtual disk - as a cache. - - [user@fedora-29 ~]$ sudo mkfs.ext4 /dev/xvdi - [user@fedora-29 ~]$ sudo mount /dev/xvdi /mnt/removable - [user@fedora-29 ~]$ sudo dnf clean all - [user@fedora-29 ~]$ sudo dnf --releasever=29 --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-29 ~]$ cat /etc/fedora-release - - 5. Shut down the new TemplateVM (from the command-line or Qubes VM Manager). - - [user@dom0 ~]$ qvm-shutdown fedora-29 - - 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-29 - - 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-28`, not - `fedora-29`.) - - [user@dom0 ~]$ sudo dnf remove qubes-template-fedora-28 - - -### 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-29 - - -### Upgrading StandaloneVMs ### - -The procedure for upgrading a StandaloneVM from Fedora 28 to Fedora 29 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 28 Template to Fedora 29 ### - -**Note:** The prompt on each line indicates where each command should be entered -(`@dom0` or `@fedora-29`). - - [user@dom0 ~]$ qvm-clone fedora-28-minimal fedora-29-minimal - [user@dom0 ~]$ qvm-run -u root -a fedora-29-minimal xterm - [root@fedora-29-minimal ~]# dnf clean all - [user@fedora-29-minimal ~]# dnf --releasever=29 --best --allowerasing distro-sync - - (Shut down TemplateVM by any normal means.) - - [user@dom0 ~]$ qvm-trim-template fedora-29-minimal - -(If you encounter insufficient space issues, you may need to use the methods -described for the standard template above.) - - Qubes 4.0 Instructions ---------------------- @@ -351,6 +174,11 @@ 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 ----------------------