Skip to content

Documents use of test repos for qubes-mgmt-salt package #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eloquence merged 1 commit into from
Nov 10, 2020
Merged

Documents use of test repos for qubes-mgmt-salt package #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions docs/admin/upgrading_to_fedora_31.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,29 @@ bar.
When the download has concluded, you will be prompted to install the package.
Type ``y`` to proceed with the installation.

TEMPORARY: Exclude Salt packages from updates
---------------------------------------------
TEMPORARY: Update the ``qubes-mgmt-salt-vm-connector`` package
--------------------------------------------------------------

.. important:: Due to an `upstream issue <https://github.com/QubesOS/qubes-issues/issues/6188>`_,
you will need to exclude the ``salt`` and ``salt-ssh`` packages from updates, as the current
versions conflict with the Qubes updater. After the Fedora 31 template is installed, follow
the instructions below to do so:
.. important:: Due to an `upstream issue <https://github.com/QubesOS/qubes-issues/issues/6188>`_, blocking updates
either via the Qubes Updater or the SecureDrop Workstation launcher, you will
need to temporarily update the ``qubes-mgmt-salt-vm-connector`` package in the ``fedora-31`` TemplateVM
with the version in the Qubes testing repo. Follow the steps below:

* Open a ``fedora-31`` terminal via **Q > Template: fedora-31 > fedora-31: Terminal**.
* Run the command ``echo "exclude=salt salt-ssh" | sudo tee -a /etc/dnf/dnf.conf``
* Shut down the ``fedora-31`` VM with the command ``sudo poweroff``.
* Open a ``fedora-31`` terminal via **Q > Template: fedora-31 > fedora-31: Terminal**.
* Run the command:

.. code-block:: sh

sudo dnf update --refresh --enablerepo=qubes-vm-r4.0-current-testing \
qubes-mgmt-salt-vm-connector

* Shut down the ``fedora-31`` VM with the command ``sudo poweroff``.

These steps will be removed from this document as soon as the issue mentioned above
is resolved. This fix does not need to be reverted - as soon as the fixed version is
available in the prod repos, it will be applied with the next update.

These steps will be removed from this document as soon as the issue mentioned above
is resolved, and future versions of SecureDrop Workstation will revert the configuration
change above. If you wish to revert the workaround manually, follow these steps:

* Open a ``fedora-31`` terminal via **Q > Template: fedora-31 > fedora-31: Terminal**.
* Run the command ``sudo sed -i '/^exclude=/ d' /etc/dnf/dnf.conf``
* Shut down the ``fedora-31`` VM with the command ``sudo poweroff``.

Update the Fedora-31 template
-----------------------------
Expand Down