From e1cc177aa01802810835bbb9c71f3ff8a9e7300a Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sun, 20 Apr 2014 09:02:51 +0000 Subject: [PATCH] UpgradeToR2rc1 changed Removed notes to qubes-testers, now all packages should be in current repos --- UpgradeToR2rc1.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/UpgradeToR2rc1.md b/UpgradeToR2rc1.md index 4840c5ab..73bf2015 100644 --- a/UpgradeToR2rc1.md +++ b/UpgradeToR2rc1.md @@ -14,7 +14,7 @@ Current Qubes R2 Beta 3 (R2B3) systems can be upgraded in-place to the latest R2 Upgrade Template and Standalone VM(s) ------------------------------------- -- Qubes R2 rc1 comes with new template based on Fedora 20. You can upgrade existing template according to procedure described [here](/wiki/FedoraTemplateUpgrade). (**Note to qubes-testers**: please enable `qubes-vm-r2b3-current-testing` for the template upgrade) +- Qubes R2 rc1 comes with new template based on Fedora 20. You can upgrade existing template according to procedure described [here](/wiki/FedoraTemplateUpgrade). - **It also possible to download a new Fedora 20-based template from our repositories**. To do this please first upgrade the Dom0 distro as described in the section below. @@ -35,17 +35,11 @@ Note that dom0 in R2rc1 is based on Fedora 20, in contrast to Fedora 18 in previ sudo qubes-dom0-update ``` -**NOTE to qubes-testers**: for the time being please use the current-testing repo for this step: - -``` {.wiki} -sudo qubes-dom0-update --enablerepo=qubes-dom0-r2b3-current-testing -``` - After this step you should have `qubes-release-2-5` in your Dom0. Important: if you happen to have `qubes-release-2-6*` then you should downgrade to `qubes-release-2-5`! The `qubes-release-2-6*` packages have been uploaded to the testing repos and were kept there for a few hours, until we realized they bring incorrect repo definitions and so we removed them and also have changed the update procedure a bit (simplifying it). 1. Upgrade dom0 to R2 rc1: -Note: be sure that the VM used as a update-downloading-vm (by default its the firewallvm based on the default template) has been updated to the latest qubes packages, specifically `qubes-core-vm-2.1.31` or later. This doesn't imply that the VM must already be upgraded to fc20 -- for Dom0 upgrade we could still use an fc18-based VM (updatevm) it is only important to install the latest Qubes packages there. (**Note to qubes-testers**: please enable `qubes-vm-r2b3-current-testing` for the template upgrade) +Note: be sure that the VM used as a update-downloading-vm (by default its the firewallvm based on the default template) has been updated to the latest qubes packages, specifically `qubes-core-vm-2.1.31` or later. This doesn't imply that the VM must already be upgraded to fc20 -- for Dom0 upgrade we could still use an fc18-based VM (updatevm) it is only important to install the latest Qubes packages there. ``` {.wiki} sudo qubes-dom0-update qubes-dom0-dist-upgrade