change to more genrall app vm install instead of sys-usb

nitrokey3/linux/firmware-update-qubes.rst

@@ -5,48 +5,20 @@ Firmware Update With Qubes OS
 
  .. contents:: :local:
 
-This guide describes how to update Nitrokey 3's firmware with Qubes OS.
+This guide describes how to update Nitrokey 3's firmware with nitropy in Qubes OS. 
 
-.. important::
-	This process might change in the future when https://github.com/QubesOS/qubes-issues/issues/8953 is resolved
-
-Setup
------
-
-.. important::
-	This setup is not persistence, if your sys-usb is not persistent, which is recommended and the default. So this needs to be done again
-	if you want to update again. For all other nitropy operations attaching the Nitrokey to app VM is working.
-
-1. Enable network via sys-firewall in sys-usb in Qubes Settings
-
-.. figure:: images/update-nk3/settings.png
-   :alt: qubes settings sys-usb
+.. important:: 
+   please read the general `firmware update instructions`_ before! Since for specifc versions there are limitations regarding what data is possible to migrate to the new version. 
 
-.. figure:: images/update-nk3/settings_network_on.png
-   :alt: enable network sys-usb
+.. _firmware update instructions: ./firmware-update.html
 
-2. Open terminal in sys-usb
 
-.. figure:: images/update-nk3/sys-usb_terminal.png
-   :alt: sys-usb terminal
-
-2. Install pynitrokey for Fedora based sys-usb 
-
-.. code-block:: bash
-
-	sudo dnf install python3-pip wget
-	python3 -m pip install --user pipx
-	python3 -m pipx ensurepath
-	pipx install pynitrokey
-
-
-3. Install udev rules 
+Setup
+-----
 
-.. code-block:: bash
+install nitropy in a app vm of your choice follow this `installation instructions`_
 
-	wget https://raw.githubusercontent.com/Nitrokey/libnitrokey/master/data/41-nitrokey.rules
-	sudo mv 41-nitrokey.rules /etc/udev/rules.d/
-	sudo udevadm control --reload-rules && sudo udevadm trigger
+.. _installation instructions: ../../software/nitropy/all-platforms/installation.html
 
 
 How to Update
@@ -56,67 +28,13 @@ How to Update
    Never disconnect the Nitrokey 3 or abort the process while updating,
    because it will likely render your device unusable!
 
-1. Run ``nitropy nk3 update`` in sys-usb.
+1. Run ``nitropy nk3 reboot --bootloader`` in app vm.
 2. Once instructed by ``nitropy`` touch the device to activate the bootloader.
-3. Please wait until the process finished. (This may vary depending on your operating system)
-4. *Optional*: run ``nitropy nk3 test`` to check if device is working properly after flashing.
-5. Restart sys-usb and disable the network in Qubes Settings again
+3. This will detach the nitrokey from the app vm, and the bootloader will apear in sys-usb 
+4. attach the bootloader to the app vm 
+5. run ``nitropy nk3 update`` and follow the instrutions, in the end this will reboot the nitrokey to finalice the update.
+6. reattch the nitrokey back to th app vm
 
 In case of any errors please take the logs from ``/tmp`` directory (``/tmp/nitropy.log.*``).
 
-.. _Nitrokey 3 Firmware - GitHub Releases: https://github.com/Nitrokey/nitrokey-3-firmware/releases
-.. _installation instructions: ../../software/nitropy/all-platforms/installation.html
-
-
-Firmware Release Types
-----------------------
-
-There are three types of firmware releases for the Nitrokey 3:
-
-**Stable releases** are most important for users.
-They are designed to be backward compatible and to retain all user data and are thoroughly tested.
-On production devices, only stable releases should be used.
-
-A **release candidate** is a preview of an upcoming stable release.
-It should also be backward compatible but is not tested as thoroughly as a stable release.
-
-**Test releases** (previously: *alpha releases*) contain additional features that are not ready for production yet.
-User data created with a test release may not be compatible with other releases.
-These releases are still being tested and are more likely to contain bugs.
-
-See the `release notes`_ on GitHub for more information on the features available in a release.
-
-.. _release notes: https://github.com/Nitrokey/nitrokey-3-firmware/releases
-
-You can identify the type of a firmware release by its version number:
-
-.. list-table::
-   :widths: 1, 2, 1
-   :header-rows: 1
-
-   * - Type
-     - Version Number
-     - Example
-   * - stable release
-     - ``v<major>.<minor>.<patch>``
-     - ``v1.3.1``
-   * - release candidate
-     - ``v<major>.<minor>.<patch>-rc.<counter>``
-     - ``v1.3.1-rc.1``
-   * - test release
-     - ``v<major>.<minor>.<patch>-test.<date>``
-     - ``v1.3.1-test.20230414``
-
-Downgrade Protection
---------------------
-
-The firmware of the Nitrokey 3 cannot be downgraded. You can only install a firmware update with the same or a higher major, minor and patch version number than the firmware currently installed on the device. This protects against downgrade attacks where a secure firmware version would be replaced with an old, potentially insecure version.
-
-Examples:
-
-- ``v1.3.1`` can be updated to ``v1.3.1-test.20230414`` and vice versa because they have the same major, minor and patch version number.
-- ``v1.3.1`` can be updated to ``v1.3.2`` or ``v1.4.0`` because the version number increases.
-- ``v1.3.1`` cannot be updated to ``v1.3.0-rc.1`` because the version number would decrease.
 
-This is mostly relevant for users that rely on a feature from the test releases.
-Users of the stable firmware can always update to the latest available firmware version.