Merge branch 'pr/1549'

Author: rapenne-s

user/advanced-topics/usb-qubes.rst

@@ -92,7 +92,7 @@ When using a USB keyboard on a system with multiple USB controllers, we recommen
 
 5. Save and close the file.
 
-6. Run the command ``grub2-mkconfig -o /boot/grub2/grub.cfg`` (legacy boot) or ``grub2-mkconfig -o /boot/efi/EFI/qubes/grub.cfg`` (EFI) in dom0.
+6. Run the command ``grub2-mkconfig -o /boot/grub2/grub.cfg``
 
 7. Reboot.
 
@@ -182,17 +182,11 @@ USB controllers are automatically hidden from dom0 if you opt to create a USB qu
 
 2. Hide (i.e., blacklist) all USB controllers from dom0.
 
+.. warning:: **If you use a USB keyboard**, hiding your USB controllers from dom0 could lock you out of your system. See :ref:`user/advanced-topics/usb-qubes:usb keyboards` for more information.
 
+.. warning:: **Using a USB AEM device** requires dom0 to have access to the USB controller to which your USB AEM device is attached. If dom0 cannot read your USB AEM device, AEM will hang.
 
-**Warning:** If you use a USB keyboard, hiding your USB controllers from dom0 could lock you out of your system. See :ref:`user/advanced-topics/usb-qubes:usb keyboards` for more information.
-
-**Warning:** Using a USB AEM device requires dom0 to have access to the USB controller to which your USB AEM device is attached. If dom0 cannot read your USB AEM device, AEM will hang.
-
-The following procedure will hide all USB controllers from dom0.
-
-GRUB2 (legacy boot or EFI)
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
+The following procedure will hide all USB controllers from dom0:
 
 1. Open the file ``/etc/default/grub`` in dom0.
 
@@ -202,21 +196,14 @@ GRUB2 (legacy boot or EFI)
 
 4. Save and close the file.
 
-5. Run the command ``grub2-mkconfig -o /boot/grub2/grub.cfg`` (legacy boot) or ``grub2-mkconfig -o /boot/efi/EFI/qubes/grub.cfg`` (EFI) in dom0.
+5. Run the command ``grub2-mkconfig -o /boot/grub2/grub.cfg``
 
 6. Reboot.
 
-
-
 How to remove a USB qube
 ------------------------
 
-
-**Warning:** This procedure will result in your USB controller(s) being attached directly to dom0.
-
-GRUB2
-^^^^^
-
+.. warning:: This procedure will result in your USB controller(s) being attached directly to dom0.
 
 1. Shut down the USB qube.
 
@@ -233,25 +220,3 @@ GRUB2
 7. Run the command ``grub2-mkconfig -o /boot/grub2/grub.cfg`` in dom0.
 
 8. Reboot.
-
-
-
-Qubes 4.0: EFI
-^^^^^^^^^^^^^^
-
-
-1. Shut down the USB qube.
-
-2. In Qubes Manager, right-click on the USB qube and select “Remove VM.”
-
-3. Open the file ``/boot/efi/EFI/qubes/xen.cfg`` in dom0.
-
-4. Find the line(s) that begins with ``kernel=``.
-
-5. If ``rd.qubes.hide_all_usb`` appears anywhere in those lines, remove it.
-
-6. Save and close the file.
-
-7. Reboot.
-
-

user/troubleshooting/autostart-troubleshooting.rst

@@ -2,9 +2,6 @@
 Autostart troubleshooting
 =========================
 
-
-The following instructions are valid for **Qubes OS R4.0 legacy mode** and **Qubes OS R4.1 legacy and UEFI modes**. For **Qubes OS R4.0 in UEFI mode**, there is no GRUB, so manual boot from another operating system is needed.
-
 In several cases, there is a need to prevent ``autostart=True`` for qubes on boot. For example:
 
 - ``sys-usb`` was enabled, but the only keyboard is attached via USB, and the ``qubes.InputKeyboard`` service is disabled.

user/troubleshooting/installation-troubleshooting.rst

@@ -125,7 +125,7 @@ Here are the steps to fix this. Note that this allows sys-net and sys-usb to tak
 
 2. Add ``qubes.enable_insecure_pv_passthrough`` to ``GRUB_CMDLINE_LINUX`` in ``/etc/default/grub``
 
-3. Run ``sudo grub2-mkconfig -o /boot/efi/EFI/qubes/grub.cfg``. If you are using a non-UEFI BIOS (where ``/boot/efi/EFI`` doesn’t exist), use the command ``sudo grub-mkconfig -o /boot/grub2/grub.cfg`` instead.
+3. Run ``sudo grub-mkconfig -o /boot/grub2/grub.cfg``
 
 4. Reboot
 

user/troubleshooting/resume-suspend-troubleshooting.rst

@@ -160,4 +160,4 @@ Suspend turns off the screen and gets stuck
 -------------------------------------------
 
 
-On some devices suspend-to-RAM does not work and a hard power-off is needed to recover, because the system does not go into deep sleep. To get suspend to work, you need to add ``mem_sleep_default=deep`` kernel option. For legacy boot, or UEFI/legacy in R4.1+, add it to the ``GRUB_CMDLINE_LINUX`` setting in ``/etc/default/grub``, update the grub config, and reboot. In R4.0 with UEFI boot, you need to add it to every ``kernel=`` line in ``/boot/efi/EFI/qubes/xen.cfg`` and reboot.
+On some devices suspend-to-RAM does not work and a hard power-off is needed to recover, because the system does not go into deep sleep. To get suspend to work, you need to add ``mem_sleep_default=deep`` kernel option. Add it to the ``GRUB_CMDLINE_LINUX`` setting in ``/etc/default/grub``, update the grub config, and reboot.

user/troubleshooting/uefi-troubleshooting.rst

@@ -148,3 +148,25 @@ Accessing installer Rescue mode on UEFI
 ---------------------------------------
 
 Choose “Rescue a Qubes OS system” from grub2 boot menu.
+
+Updating GRUB options doesn't work
+----------------------------------
+
+If you upgraded from Qubes OS R4.0 or followed outdated instructions, you might have a wrong `grub.cfg` file.
+
+The content of :file:`/boot/efi/EFI/qubes/grub.cfg` should be something like:
+
+.. code:: bash
+
+   search --no-floppy --fs-uuid --set=dev xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   set prefix=($dev)/grub2
+   export $prefix
+   configfile $prefix/grub.cfg
+
+Where the end of the first line is replaced by a UUID. If not, you can reinstall this file:
+
+.. code:: console
+
+   sudo qubes-dom0-update --action=reinstall grub2-common
+
+After that, running the `grub2-mkconfig` command should work.