Skip to content

Commit

Permalink
Merge pull request #106 from freedomofpress/f35
Browse files Browse the repository at this point in the history
Switch base template upgrade instructions from Fedora 34 to Fedora 35
  • Loading branch information
eloquence authored Jun 6, 2022
2 parents cc8419a + 7b16a78 commit 8e26aaa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docs/admin/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pre-install tasks:
#. Download and verify Qubes OS
#. Install Qubes OS
#. Apply updates to system templates
#. Install Fedora 34 base template
#. Install Fedora 35 base template

Install tasks:
~~~~~~~~~~~~~~
Expand Down Expand Up @@ -143,7 +143,7 @@ Before installing SecureDrop Workstation, you must set up network and Tor access

- Once Tor has connected, select **Q > System Tools > Qubes Update** to update the system VMs. in the ``[Dom0] Qubes Updater`` window, first check ``Enable updates for qubes without known available updates``, then check all entries in the list above. Then, click **Next**. The system's VMs will be updated sequentially - this may take some time. When the updates are complete, click **Finish**.

Install Fedora 34 template
Install Fedora 35 template
~~~~~~~~~~~~~~~~~~~~~~~~~~

See :doc:`upgrading_fedora`.
Expand Down
14 changes: 7 additions & 7 deletions docs/admin/upgrading_fedora.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Upgrading to Fedora 34
Upgrading to Fedora 35
======================

.. include:: ../includes/top-warning.rst
Expand All @@ -12,23 +12,23 @@ usb``, ``work``, and ``vault`` . In Qubes 4.0.4, these VMs are based on a
Fedora 32 template, which reached end-of-life on May 25, 2021.

If you are provisioning SecureDrop Workstation for the first time, you will need
to update your Fedora template manually to Fedora 34 *before* installing
to update your Fedora template manually to Fedora 35 *before* installing
SecureDrop Workstation.

If you are an existing SecureDrop Workstation user, SecureDrop Workstation
will install the template automatically when updates are applied, but you
should also :ref:`manually configure <configure_vms>` VMs not managed by
SecureDrop Workstation to use the Fedora 34 template.
SecureDrop Workstation to use the Fedora 35 template.

Install Fedora-34 template
--------------------------

In a ``dom0`` terminal (**Qubes Application Menu > Terminal Emulator**), type
the following to download the Fedora 34 template:
the following to download the Fedora 35 template:

.. code:: sh
sudo qubes-dom0-update qubes-template-fedora-34
sudo qubes-dom0-update qubes-template-fedora-35
You will see some information from the package manager, including a progress
bar.
Expand All @@ -42,7 +42,7 @@ Update the Fedora-34 template
Once the template installation is complete, update the template using the Qubes
Updater. Click **Q > System Tools > Qubes Update** in the application menu.
Click the checkbox "Enable updates for qubes without known updates" option,
and click the checkbox next to ``fedora-34``. Click **Next** and wait for
and click the checkbox next to ``fedora-35``. Click **Next** and wait for
any available updates to be downloaded and applied.

.. _configure_vms:
Expand All @@ -53,7 +53,7 @@ To apply the template to VMs that currently use an older version, open the
Qube Manager via **Q > System Tools > Qube Manager**. All VMs will be visible at
a glance; to change a VM's settings, right-click it and select **Qube Settings**.

In the Qube Settings window, select ``fedora-34`` from the drop-down menu
In the Qube Settings window, select ``fedora-35`` from the drop-down menu
beside **Template**, then click **OK.**

|screenshot_qsettings_fedora32|
Expand Down

0 comments on commit 8e26aaa

Please sign in to comment.