Merge branch 'master' into disk-troubleshooting

external/os-guides/windows/windows-tools.md

@@ -19,22 +19,34 @@ Qubes Windows Tools
 
 Qubes Windows Tools are a set of programs and drivers that provide integration of Windows AppVMs with the rest of the Qubes system. Currently the following features are available for Windows VMs after installation of those tools:
 
--   Seamless GUI mode that integrates apps windows onto the common Qubes trusted desktop
+-   **Qubes Video Driver** - provides for the Seamless GUI mode that integrates apps windows onto the common Qubes trusted desktop
--   Support for [secure clipboard copy/paste](/doc/copy-paste/) between the Windows VM and other AppVMs
+-   **File sender/receiver** - Support for [secure clipboard copy/paste](/doc/copy-paste/) between the Windows VM and other AppVMs
--   Support for [secure file exchange](/doc/copying-files/) between the Windows VM and other AppVMs
+-   ***File sender/receiver** - Support for [secure file exchange](/doc/copying-files/) between the Windows VM and other AppVMs
--   Support for qvm-run and generic qrexec for the Windows VM (e.g. ability to run custom service within/from the Windows VM)
+-   **Copy/Edit in Disposable VM** - Support for editing files in DisposableVMs as well as for qvm-run and generic qrexec for the Windows VM (e.g. ability to run custom service within/from the Windows VM)
--   Xen PV drivers for Windows that increase performance compared to qemu emulated devices
+-   **Xen PV drivers** for Windows that increase performance compared to qemu emulated devices
+
+Below is a breakdown of the feature availability depending on the windows version:
+
+|             Feature                  |  Windows 7 x64 | Windows 10 x64 |
+| ------------------------------------ | :------------: | :------------: |
+| Qubes Video Driver                   |        +       |       -        |
+| Qubes Network Setup                  |        +       |       +        |
+| Private Volume Setup (move profiles) |        +       |       +        |
+| File sender/receiver                 |        +       |       +        |
+| Clipboard Copy/Paste                 |        +       |       +        |
+| Application shortcuts                |        +       |       +        |
+| Copy/Edit in Disposable VM           |        +       |       +        |
+| Block device                         |        +       |       +        |
+| USB device                           |        -       |       -        |
+| Audio                                |        -       |       -        |
 
 Qubes Windows Tools are open source and are distributed under a GPL license.
 
 NOTES:
 - Qubes Windows Tools are currently unmaintained
-- Currently only 64-bit versions of Windows 7 are supported by Qubes Windows Tools. Only emulated SVGA GPU is supported (although [there has been reports](https://groups.google.com/forum/#!topic/qubes-users/cmPRMOkxkdA) on working GPU passthrough).
+- Currently only 64-bit versions of Windows 7 and Windows 10 are supported by Qubes Windows Tools. Only emulated SVGA GPU is supported (although [there has been reports](https://groups.google.com/forum/#!topic/qubes-users/cmPRMOkxkdA) on working GPU passthrough).
-- There is currently no audio support for Windows HVMs.
-- There is currently no USB pass-through support for Windows HVMs.
 - __This page documents the process of installing Qubes Windows Tools on versions up to R3.2.__. Installation on Qubes R4.0 is possible but is a work in progress and there are limitations/bugs (see [issue #3585](https://github.com/QubesOS/qubes-issues/issues/3585)).
 
-
 Installing Windows OS in a Qubes VM
 -----------------------------------
 
@@ -42,6 +54,51 @@ Please refer to [this page](/doc/windows-vm/) for instructions on how to install
 
 NOTE: It is strongly suggested to enable autologon for any Windows HVMs that will have Qubes Tools installed. To do so, run `netplwiz` command from the `Win+R`/Start menu and uncheck the *Users must enter a user name and password to use this computer* option.
 
+Installing Qubes guest tools in Windows 10 VMs
+----------------------------------------------
+
+This will allow you to install the Qubes Windows Tools on Windows 10 both as a StandaloneVM as well as a Template VM and a corresponding AppVM. But some features are not available:
+
+> **Note:** seamless mode is currently not available for windows. Please check the top of this document for the full feature availability breakdown.
+
+ 1. In the Windows 10 VM, download from the [XEN website](https://xenproject.org/downloads/windows-pv-drivers/windows-pv-drivers-9-series/windows-pv-drivers-9-0-0/) the installation kits for Xen bus (`xenbus`) and storage drivers (`xenvbd`) Version 9.0.0 (two files`xenvbd.tar`and `xenbus.tar`).
+ 
+ 2. Use an archive extractor like [7-zip](https://www.7-zip.org/) to extract the contents of the `.tar` files.
+ 
+ 3. Install `xenvbd` and `xenbus` by starting the file `dpinst.exe` from the `x64` directories of the extracted tar-files. If during installation, the Xen driver requests a reboot, select "No" and let the installation continue.
+ 
+ 4. After installation, reboot.
+
+ 5. Download the Qubes Windows Tools (`qubes-tools-4.0.1.3.exe`) from [the qubes FTP server](https://ftp.qubes-os.org/qubes-windows-tools/) and move it to `C:\`.
+ 
+ 6. Check the integrity of the file `qubes-tools-4.0.1.3.exe`by comparing its hash checksum. This can be done using the Windows command `certutil` on the windows command prompt (`cmd.exe`) and specifying an appropriate hash algorithm like:
+        
+		certutil --hashfile C:\qubes-tools-4.0.1.3.exe SHA256
+
+	And compare it the value to `148A2A993F0C746B48FA6C5C9A5D1B504E09A7CFBA3FB931A4DCF86FDA4EC9B1` (**it has to exactly match for security reasons**). If it matches, feel free to continue the installation. If not, repeat the download to make sure it was not corrupted due to a network problem. If keeps on not matching it might be an attacker attempting to do something nasty to your system -- Ask for support.
+
+    > **Note**: this is a workaround for installing the qubes windows tools on windows 10 since the standard way is broken.
+
+ 7. Install Qubes Windows Tools 4.0.1.3 by starting `qubes-tools-4.0.1.3.exe`, not selecting the `Xen PV disk drivers` and the `Move user profiles` (which would probably lead to problems in Windows, anyhow). If during installation, the Xen driver requests a reboot, select "No" and let the installation continue - the system will be rebooted later.
+
+ 8. Shut down Windows.
+
+ 9. On a `dom0` terminal write: *(where `<VMname>` is the name of your Windows 10 VM)*
+  
+		qvm-features <VMname> gui 1
+
+ 10. Reboot Windows. If the VM starts, but does not show any window then shutdown Windows from the Qube manager and reboot Windows once more.
+ 
+ 11. Now the system should be up, with QWT running correctly.
+ 
+ 12. Lastly to enable file copy operations to a Windows 10 VM the `default_user` property should be set the `<username>` that you use to login to the Windows VM. This can be done via the following command on a `dom0` terminal: *(where `<VMname>` is the name of your Windows 10 VM)*
+  
+		`qvm-prefs <VMname> default_user <username>`
+
+     > **Note:** If this property is not set or set to a wrong value, files copied to this VM are stored in the folder `C:\Windows\System32\config\systemprofile\Documents\QubesIncoming\<source_VM>`.
+	 > If the target VM is an AppVM, this has the consequence that the files are stored in the corresponding TemplateVM and so are lost on AppVM shutdown.
+
+
 Installing Qubes guest tools in Windows 7 VMs
 ---------------------------------------------
 
@@ -91,9 +148,36 @@ NOTE: it is recommended to increase the default value of Windows VM's `qrexec_ti
 qvm-prefs -s <vm-name> qrexec_timeout 300
 ~~~
 
+Xen PV drivers and Qubes Windows Tools
+--------------------------------------
+
+Installing Xen's PV drivers in the VM will lower its resources usage when using network and/or I/O intensive applications, but *may* come at the price of system stability (although Xen's PV drivers on a Win7 VM are usually very stable). There are two ways of installing the drivers:
+
+1. installing the drivers independently, from Xen's [official site](https://www.xenproject.org/developers/teams/windows-pv-drivers.html)
+2. installing Qubes Windows Tools (QWT), which bundles Xen's PV drivers.
+
+Notes about using Xen's VBD (storage) PV driver:
+- **Windows 7:** installing the driver requires a fully updated VM or else you'll likely get a BSOD and a VM in a difficult to fix state. Updating Windows takes *hours* and for casual usage there isn't much of a performance between the disk PV driver and the default one; so there is likely no need to go through the lengthy Windows Update process if your VM doesn't have access to untrusted networks and if you don't use I/O intensive apps. If you plan to update your newly installed Windows VM it is recommended that you do so *before* installing Qubes Windows Tools (QWT). If QWT are installed, you should temporarily re-enable the standard VGA adapter in Windows and disable Qubes' (see the section above).
+- the option to install the storage PV driver is disabled by default in Qubes Windows Tools 
+- in case you already had QWT installed without the storage PV driver and you then updated the VM, you may then install the driver from Xen's site (xenvbd.tar).
+
+**Caution:** Installing the version 9.0.0 Xen drivers on Windows 7 (a system without QWT - QWT uninstalled) leads to an unbootable system. The drivers install without error, but after reboot, the system aborts the reboot saying `Missing driver xenbus.sys`.
+
+- **Windows 10:** The version 9.0.0 Xen drivers have to be installed before installing Qubes Windows Tools. Installing them on a system with QWT installed is likely to produce a system which crashes or has the tools in a non-functional state. Even if the tools were installed and then removed before installing the Xen drivers, they probably will not work as expected.
+
+
+With Qubes Windows Tools installed the early graphical console provided in debugging mode isn't needed anymore since Qubes' display driver will be used instead of the default VGA driver:
+
+~~~
+qvm-prefs -s win7new debug false
+~~~
+
+
 Using Windows AppVMs in seamless mode
 -------------------------------------
 
+> **Note:** This feature is only available for Windows 7
+
 Once you start a Windows-based AppVM with Qubes Tools installed, you can easily start individual applications from the VM (note the `-a` switch used here, which will auto-start the VM if it is not running):
 
 ~~~
@@ -133,7 +217,7 @@ Qubes allows HVM VMs to share a common root filesystem from a select Template VM
 In order to create a HVM TemplateVM one can use the following command, suitably adapted:
 
 ~~~
-qvm-create --class TemplateVM win7-x64-template --property virt_mode=HVM --property kernel=''  -l green
+qvm-create --class TemplateVM win-template --property virt_mode=HVM --property kernel=''  -l green
 ~~~
 
 ... , set memory as appropriate, and install Windows OS (or other OS) into this template the same way as you would install it into a normal HVM -- please see instructions on [this page](/doc/hvm-create/).
@@ -143,7 +227,7 @@ If you use this Template as it is, then any HVMs that use it will effectively be
 If you want to retain the User directory between reboots, then it would make sense to store the `C:\Users` directory on the 2nd disk which is automatically exposed by Qubes to all HVMs. 
 This 2nd disk is backed by the `private.img` file in the AppVMs' and is not reset upon AppVMs reboot, so the user's directories and profiles would survive the AppVMs reboot, unlike the "root" filesystem which will be reverted to the "golden image" from the Template VM automatically. 
 To facilitate such separation of user profiles, Qubes Windows Tools provide an option to automatically move `C:\Users` directory to the 2nd disk backed by `private.img`. 
-It's a selectable feature of the installer, enabled by default. 
+It's a selectable feature of the installer, enabled by default, but working only for Windows 7. 
 If that feature is selected during installation, completion of the process requires two reboots:
 
 -   The private disk is initialized and formatted on the first reboot after tools installation. It can't be done **during** the installation because Xen mass storage drivers are not yet active.
@@ -152,8 +236,13 @@ Reboot is required because the "mover utility" runs very early in the boot proce
 This can take some time depending on the profiles' size and because the GUI agent is not yet active dom0/Qubes Manager may complain that the AppVM failed to boot. 
 That's a false alarm (you can increase AppVM's default boot timeout using `qvm-prefs`), the VM should appear "green" in Qubes Manager shortly after.
 
-It also makes sense to disable Automatic Updates for all the template-based AppVMs -- of course this should be done in the Template VM, not in individual AppVMs, because the system-wide settings are stored in the root filesystem (which holds the system-wide registry hives). 
+For Windows 10, the user directories have to be moved manually, because the automatic transfer during QWT installation is bound to crash due to undocumented new features of NTFS, and a system having the directory `users`on another disk than `C:` will break on Windows update. So the following steps should be taken:
-Then, periodically check for updates in the Template VM and the changes will be carried over to any child AppVMs.
+
+-  The Windows disk manager may be used to add the private volume as disk `D:`, and you may, using the documented Windows operations, move the user directories `C:\users\<username>\Documents` to this new disk, allowing depending AppVMs to have their own private volumes. Moving the hidden application directories `AppData`, however, is likely to invite trouble - the same trouble that occurs if, during QWT installation, the option `Move user profiles` is selected.
+
+-  Configuration data like those stored in directories like `AppData` still remain in the TemplateVM, such that their changes are lost each time the AppVM shuts down. In order to make permanent changes to these configuration data, they have to be changed in the TemplateVM, meaning that applications have to be started there, which violates and perhaps even endangers the security of the TemplateVM. Such changes should be done only if absolutely necessary and with great care. It is a good idea to test them first in a cloned TemplateVM before applying them in the production VM.
+
+It also makes sense to disable Automatic Updates for all the template-based AppVMs -- of course this should be done in the Template VM, not in individual AppVMs, because the system-wide settings are stored in the root filesystem (which holds the system-wide registry hives). Then, periodically check for updates in the Template VM and the changes will be carried over to any child AppVMs.
 
 Once the template has been created and installed it is easy to create AppVMs based on it:
 

external/os-guides/windows/windows-vm.md

@@ -111,7 +111,7 @@ qvm-prefs win7new qrexec_timeout 300
 qvm-prefs win7new debug false
 ~~~
 
-To install Qubes Windows Tools, follow instructions [below](#xen-pv-drivers-and-qubes-windows-tools).
+To install Qubes Windows Tools, follow instructions in [Qubes Windows Tools](/doc/windows-tools/).
 
 ### Detailed instructions ###
 
@@ -119,7 +119,7 @@ MS Windows versions considerations:
 
 - The instructions *may* work on other versions than Windows 7 x64 but haven't been tested.
 - Qubes Windows Tools (QWT) only supports Windows 7 x64. Note that there are [known issues](https://github.com/QubesOS/qubes-issues/issues/3585) with QWT on Qubes 4.x
-- For Windows 10 under Qubes 4.0, a way to install QWT 4.0.1.3, which has worked in several instances, is described below.
+- For Windows 10 under Qubes 4.0, a way to install QWT 4.0.1.3, which has worked in several instances, is described in [Qubes Windows Tools](/doc/windows-tools/).
 
 Create a VM named win7new in [HVM](/doc/hvm/) mode (Xen's current PVH limitations precludes from using PVH):
 
@@ -209,61 +209,15 @@ Finally, increase the VM's `qrexec_timeout`: in case you happen to get a BSOD or
 qvm-prefs win7new qrexec_timeout 300
 ~~~
 
-At that point you should have a functional and stable Windows VM, although without updates, Xen's PV drivers nor Qubes integration (see sections [Windows Update](#windows-update) and [Xen PV drivers and Qubes Windows Tools](#xen-pv-drivers-and-qubes-windows-tools) below). It is a good time to clone the VM again.
+At that point you should have a functional and stable Windows VM, although without updates, Xen's PV drivers nor Qubes integration (see sections [Windows Update](#windows-update) and [Xen PV drivers and Qubes Windows Tools](/doc/windows-tools/#xen-pv-drivers-and-qubes-windows-tools)). It is a good time to clone the VM again.
 
-### Installing Qubes Windows Tools on Windows 10
-
-If the Xen bus and storage drivers version 9.0.0 are installed in a Windows 10 system without Qubes Windows Tools, and QWT 4.0.1.3 are installed after the Xen installation has finished, the Qubes interface works correctly. Files can be exchanged with other VMs, and the common clipboard works in both directions.
-
-The installation of Qubes Windows Tools should **not** be done by using the parameter `--install-windows-tools`or by directly specifying `--cdrom=...`when starting the Windows VM, as this is bound to crash the VM on booting, showing the error `INACCESSIBLE BOOT DEVICE`- which makes no sense, but does happen.
-
-So to get a working Windows 10 system (Standalone or Template VM) under Qubes R4.0, the following steps should be performed:
-
-**to be replaced**
-- Install Qubes Windows Tools in dom0: `sudo qubes-dom0-update qubes-windows-tools`. The iso will be the file `/usr/lib/qubes/qubes-windows-tools-4.0.1.3.iso`.
-- Copy this file to some AppVM: `qvm-copy-to-vm VMname /usr/lib/qubes/qubes-windows-tools-4.0.1.3.iso`.
-- In this VM, extract the file `qubes-tools-4.0.1.3.exe` from the iso, using the archive manager.
-- Copy the installation kits of `xenvbd` and `xenbus` Version 9.0.0 (two Zip-files) from the Xen web site and the file `qubes-tools-4.0.1.3.exe` to the Windows system drive (normally `C:\`.)
-**end of replaced text**
-
-**new text**
-- In the Windows 10 VM, download the installation kits of `xenvbd` and `xenbus` Version 9.0.0 (two files`xenvbd.tar`and `xenbus.tar`) from the Xen web site and the file `qubes-tools-4.0.1.3.exe` from https://www.qubes-os.org/doc/windows-tools/ **enter the final url** and store them on the Windows system drive (normally `C:\`.) In order to extract the contents from the tar-archives, you will need an external utility like 7zip.
-**end of new text**
-
-- Check the integrity of the file `qubes-tools-4.0.1.3.exe`by comparing its hash checksum. This can be done using the Windows command `certutil` specifying an appropriate hash algorithm like:
-~~~
-certutil --hashfile qubes-tools-4.0.1.3.exe SHA256
-~~~
-This utility supports the algorithms MD5, SHA1, SHA256 and SHA512 (to be entered in uppercase!). The correct hash values can be retrieved from the Qubes website: https://www.qubes-os.org/doc/windows-tools/ **enter the final url**
-
-- Install `xenvbd` and `xenbus` version 9.0.0 by starting the file `dpinst.exe` from the `x64` directories of the extracted tar-files. If during installation, the Xen driver requests a reboot, select "No" and let the installation continue.
-- After installation, reboot.
-- Install Qubes Windows Tools 4.0.1.3 by starting `qubes-tools-4.0.1.3.exe`, not selecting the `Xen PV disk drivers` and the `Move user profiles` (which would probably lead to problems in Windows, anyhow). If during installation, the Xen driver requests a reboot, select "No" and let the installation continue - the system will be rebooted later.
-- Shut down Windows.
-- Set `qvm-features win10new gui 1`
-- Reboot Windows. The VM starts, but does not show any window.
-- Shutdown Windows from the Qube manager.
-- Reboot Windows once more. Now the system is up, with QWT running correctly.
-
-For me, this sequence worked for Windows 10 as template VM, and a corresponding AppVM worked too.
-
-File copy operations to a Windows 10 VM are possible, if the Qubes OS `default_user` property is set to the user name used for access to that VM, which can be done via the command
-~~~
-qvm-prefs <VMname> default_user <username>
-~~~
-If this property is not set or set to a wrong value, files copied to this VM are stored in the folder
-~~~
-C:\Windows\System32\config\systemprofile\Documents\QubesIncoming\<source_VM>
-~~~
-If the target VM is an AppVM, this has the consequence that the files are stored in the corresponding TemplateVM and so are lost on AppVM shutdown.
 
 Windows as TemplateVM
 ---------------------
 
 Windows 7 and 10 can be installed as TemplateVM by selecting
 ~~~
-qvm-create --class TemplateVM --property virt_mode=HVM --property kernel='' --label black Windows-7
+qvm-create --class TemplateVM --property virt_mode=HVM --property kernel='' --label black Windows-template
-qvm-create --class TemplateVM --property virt_mode=HVM --property kernel='' --label black Windows-10
 ~~~
 when creating the VM. To have the user data stored in AppVMs depending on this template, Windows 7 and 10 have to be treated differently:
 
@@ -297,36 +251,6 @@ Note: if you already have Qubes Windows Tools installed the video adapter in Win
 To avoid guessing the VM's state enable debugging (`qvm-prefs -s win7new debug true`) and in Windows' device manager (My computer -> Manage / Device manager / Display adapters) temporarily re-enable the standard VGA adapter and disable "Qubes video driver". You can disable debugging and revert to Qubes' display once the VM is updated.
 
 
-Xen PV drivers and Qubes Windows Tools
-------------------------------------
-
-Installing Xen's PV drivers in the VM will lower its resources usage when using network and/or I/O intensive applications, but *may* come at the price of system stability (although Xen's PV drivers on a Win7 VM are usually very stable). There are two ways of installing the drivers:
-
-1. installing the drivers independently, from Xen's [official site](https://www.xenproject.org/developers/teams/windows-pv-drivers.html)
-2. installing Qubes Windows Tools (QWT), which bundles Xen's PV drivers.
-
-Notes about using Xen's VBD (storage) PV driver:
-- **Windows 7:** installing the driver requires a fully updated VM or else you'll likely get a BSOD and a VM in a difficult to fix state. Updating Windows takes *hours* and for casual usage there isn't much of a performance between the disk PV driver and the default one; so there is likely no need to go through the lengthy Windows Update process if your VM doesn't have access to untrusted networks and if you don't use I/O intensive apps. If you plan to update your newly installed Windows VM it is recommended that you do so *before* installing Qubes Windows Tools (QWT). If QWT are installed, you should temporarily re-enable the standard VGA adapter in Windows and disable Qubes' (see the section above).
-- the option to install the storage PV driver is disabled by default in Qubes Windows Tools 
-- in case you already had QWT installed without the storage PV driver and you then updated the VM, you may then install the driver from Xen's site (xenvbd.tar).
-
-**Caution:** Installing the version 9.0.0 Xen drivers on Windows 7 (a system without QWT - QWT uninstalled) leads to an unbootable system. The drivers install without error, but after reboot, the system aborts the reboot saying ´Missing driver xenbus.sys´.
-
-- **Windows 10:** The version 9.0.0 Xen drivers have to be installed before installing Qubes Windows Tools. Installing them on a system with QWT installed is likely to produce a system which crashes or has the tools in a non-functional state. Even if the tools were installed and then removed before installing the Xen drivers, they probably will not work as expected.
-
-
-Installing Qubes Windows Tools:
-- on R3.2: see [this page](/doc/windows-tools/)
-- R4.0: you'll have to install QWT for Qubes R3.2. Be warned that QWT on R4.0 is a work in progress though (see [issue #3585](https://github.com/QubesOS/qubes-issues/issues/3585) for instructions and known issues).
-
-
-With Qubes Windows Tools installed the early graphical console provided in debugging mode isn't needed anymore since Qubes' display driver will be used instead of the default VGA driver:
-
-~~~
-qvm-prefs -s win7new debug false
-~~~
-
-
 Further customization
 ---------------------
 

introduction/reporting-bugs.md

@@ -114,7 +114,7 @@ If the issue is closed without one of these specific resolutions, then it means,
 
 ## See also ##
 
-- [Help, Support, and Mailing Lists]
+- [Help, Support, Mailing Lists, and Forum]
 - [Testing New Releases and Updates][testing]
 - [How to Contribute]
 - [Contributing Code]

user/advanced-configuration/salt.md

@@ -464,6 +464,26 @@ Whonix Gateway TemplateVM
 
 Whonix Workstation TemplateVM
 
+#### `update.qubes-dom0`
+
+Updates dom0
+
+#### `update.qubes-vm`
+
+Updates domUs. Example to update all TemplateVMs:
+
+    sudo qubesctl --skip-dom0 --templates state.sls update.qubes-vm
+
+Useful options:
+
+ - `--max-concurrency` --- Limits how many templates are updated at the same time.
+   Adjust to your available RAM.
+   The default is 4, and the GUI updater sets it to 1.
+ - `--targets=vm1,vm2,...` --- Limit to specific VMs, instead of all of them.
+   (Use instead of `--templates` or `--standalones`.)
+ - `--show-output` --- Show an update summary instead of just OK/FAIL.
+
+For other options, see `qubesctl --help`.
 
 ## The `qubes` Pillar Module
 
@@ -488,6 +508,7 @@ Template name on which a given VM is based (if any).
 
 VM which provides network to the given VM
 
+
 ## Debugging
 
 The output for each VM is logged in `/var/log/qubes/mgmt-VM_NAME.log`.

user/security-in-qubes/split-gpg.md

@@ -135,7 +135,8 @@ Note that, because this makes it easier to accept Split GPG's qrexec authorizati
 
 ### Thunderbird 78 and higher
 
-Starting with version 78, Thunderbird has a built-in PGP feature.
+Starting with version 78, Thunderbird has a built-in PGP feature and no longer requires the Enigmail extension. For users coming from the Enigmail extension, the built-in functionality is more limited currently, including that **public keys must live in your `work-email` qube with Thunderbird rather than your offline `work-gpg` qube**.
+
 In `work-email`, use the Thunderbird config editor (found at the bottom of preferences/options), and search for `mail.openpgp.allow_external_gnupg`. Switch the value to true. Still in config editor, search for `mail.openpgp.alternative_gpg_path`. Set its value to `/usr/bin/qubes-gpg-client-wrapper`. Restart Thunderbird after this change.
 
 [![tb78-1.png](/attachment/wiki/SplitGpg/tb78-1.png)](/attachment/wiki/SplitGpg/tb78-1.png)

user/security-in-qubes/u2f-proxy.md

@@ -112,6 +112,17 @@ Do not delete the file itself.
 The default model is to allow a qube to access all and only the keys that were enrolled by that qube.
 For example, if your `banking` qube enrolls your banking key, and your `twitter` qube enrolls your Twitter key, then your `banking` qube will have access to your banking key but not your Twitter key, and your `twitter` qube will have access to your Twitter key but not your banking key.
 
+## Non-default USB qube name
+
+If your USB qube is named differently than `sys-usb`, then do the following in the appropriate template(s):
+
+```
+systemctl enable qubes-u2fproxy@USB_QUBE.service
+systemctl disable qubes-u2fproxy@sys-usb.service
+```
+
+Replace `USB_QUBE` with the actual USB qube name.
+
 ## TemplateVM and browser support
 
 The large number of possible combinations of TemplateVM (Fedora 27, 28; Debian 8, 9) and browser (multiple Google Chrome versions, multiple Chromium versions, multiple Firefox versions) made it impractical for us to test every combination that users are likely to attempt with the Qubes U2F Proxy.

user/troubleshooting/uefi-troubleshooting.md

@@ -4,18 +4,20 @@ title: UEFI Troubleshooting
 permalink: /doc/uefi-troubleshooting/
 ---
 
-Troubleshooting UEFI related problems
+# Troubleshooting UEFI related problems #
-========================================
 
-Change installer kernel parameters in UEFI
+## Successfully installed in legacy mode, but had to change some kernel parameters ##
----------------------
 
 If you've installed successfully in legacy mode but had to change some kernel parameters for it to work, you should try installing in UEFI mode with the same parameters.
 
 **Change the xen configuration on a USB media**
 01. Attach the usb disk, mount the EFI partition (second partition available on the disk) 
-02. As `su`, edit your xen config (`EFI/BOOT/BOOTX64.cfg`) changing the `kernel` key to add your kernel parameters on the boot entry of your choice
+02. Open a terminal and enter the command `sudo su -`. Use your preferred text editor (e.g `nano`) to edit your xen config (`EFI/BOOT/BOOTX64.cfg`):
-03. Install using your modified boot entry
+   ~~~
+   nano EFI/BOOT/BOOTX64.cfg
+   ~~~
+03. Change the `kernel` key to add your kernel parameters on the boot entry of your choice
+04. Install using your modified boot entry
 
 **Change xen configuration directly in an iso image**
 01. Get EFI partition boundaries `parted Qubes-R4.0-rc4-x86_64.iso unit B print`
@@ -25,14 +27,16 @@ If you've installed successfully in legacy mode but had to change some kernel pa
 05. Save your changes, unmount and dd to usb device
 
 
-Installation freezes before displaying installer
+## Installation freezes before displaying installer ##
------------------------------------------------------------
+
+If you have an Nvidia card, see also [Nvidia Troubleshooting](/doc/nvidia-troubleshooting/#disabling-nouveau).
+
+### Removing `noexitboot` and `mapbs` ###
 
 Some systems can freeze with the default UEFI install options.
 You can try the following to remove `noexitboot` and `mapbs`.
-If you have an Nvidia card, see also [Nvidia Troubleshooting](/doc/nvidia-troubleshooting/#disabling-nouveau).
 
-1. Follow the [steps here](/doc/uefi-troubleshooting/#change-installer-kernel-parameters-in-uefi) to edit the `[qubes-verbose]` section of your installer's `BOOTX64.cfg`.
+1. Follow the [steps here](/doc/uefi-troubleshooting/#successfully-installed-in-legacy-mode-but-had-to-change-some-kernel-parameters) to edit the `[qubes-verbose]` section of your installer's `BOOTX64.cfg`.
    You want to comment out the `mapbs` and `noexitboot` lines.
    The end result should look like this:
    
@@ -59,16 +63,33 @@ This is also a good time to make permanent any other changes needed to get the i
 5. Go back to `tty6` (Ctrl-Alt-F6) and click `Reboot`.
 6. Continue with setting up default templates and logging in to Qubes.
 
+### Changing `options=console=` parameter to `none` ###
 
-Installation freezes before displaying installer / disable EFI runtime services
+If removing `noexitboot` and `mapbs` did not help, you can try changing the `options=console=` parameter to `none`. The detailed solution can be found in the comments of [this GitHub issue](https://github.com/QubesOS/qubes-issues/issues/5383)
-------------------------------------------------------------------------------
+
+1. Follow the [steps here](/doc/uefi-troubleshooting/#successfully-installed-in-legacy-mode-but-had-to-change-some-kernel-parameters) to edit the `[qubes-verbose]` section of your installer's `BOOTX64.cfg`.
+   You want to change `options=console=vga` to `options=console=none`.
+   The end result should look like this:
+
+   ~~~
+   [qubes-verbose]
+   options=console=none efi=attr=uc
+   noexitboot=1
+   mapbs=1
+   kernel=vmlinuz inst.stage2=hd:LABEL=Qubes-R4.0-x86_64 i915.alpha_support=1
+   ramdisk=initrd.img
+   ~~~
+
+2. Boot the installer and continue to install as normal
+
+### Disable EFI runtime services ###
 
 On some early, buggy UEFI implementations, you may need to disable EFI under Qubes completely.
 This can sometimes be done by switching to legacy mode in your BIOS/UEFI configuration.
 If that's not an option there, or legacy mode does not work either, you can try the following to add `efi=no-rs`.
 Consider this approach as a last resort, because it will make every Xen update a manual process.
 
-1. Follow the [steps here](/doc/uefi-troubleshooting/#change-installer-kernel-parameters-in-uefi) to edit the `[qubes-verbose]` section of your installer's `xen.cfg`.
+1. Follow the [steps here](/doc/uefi-troubleshooting/#successfully-installed-in-legacy-mode-but-had-to-change-some-kernel-parameters) to edit the `[qubes-verbose]` section of your installer's `xen.cfg`.
    You want to modify the `efi=attr=uc` setting and comment out the `mapbs` and `noexitboot` lines.
    The end result should look like this:
    
@@ -105,13 +126,11 @@ Consider this approach as a last resort, because it will make every Xen update a
 
 Whenever there is a kernel or Xen update for Qubes, you will need to follow [these steps](/doc/uefi-troubleshooting/#boot-device-not-recognized-after-installing) because your system is using the fallback UEFI bootloader in `[...]/EFI/BOOT` instead of directly booting to the Qubes entry under `[...]/EFI/qubes`.
 
-Installation from USB stick hangs on black screen
+## Installation from USB stick hangs on black screen ##
----------------------
 
-Some laptops cannot read from an external boot device larger than 8GB. If you encounter a black screen when performing an installation from a USB stick, ensure you are using a USB drive less than 8GB, or a partition on that USB lesser than 8GB and of format fat32. 
+Some laptops cannot read from an external boot device larger than 8GB. If you encounter a black screen when performing an installation from a USB stick, ensure you are using a USB drive less than 8GB, or a partition on that USB lesser than 8GB and of format FAT32. 
 
-Installation completes successfully but then boot loops or hangs on black screen
+## Installation completes successfully but then boot loops or hangs on black screen ##
----------------------
 
 There is a [common bug in UEFI implementation](http://xen.markmail.org/message/f6lx2ab4o2fch35r) affecting mostly Lenovo systems, but probably some others too.
 While some systems need `mapbs` and/or `noexitboot` disabled to boot, others require them enabled at all times.
@@ -152,8 +171,7 @@ Or if you have already rebooted after the first stage install and have encounter
 4. Continue with setting up default templates and logging in to Qubes.
 
 
-Installation completes successfully but then system crash/restarts on next boot
+## Installation completes successfully but then system crash/restarts on next boot ##
--------------------------------------------
 
 Some Dell systems and probably others have [another bug in UEFI firmware](http://markmail.org/message/amw5336otwhdxi76).
 These systems need `efi=attr=uc` enabled at all times.
@@ -180,8 +198,7 @@ Or if you have already rebooted after the first stage install and have encounter
 4. Continue with setting up default templates and logging in to Qubes.
 
 
-Boot device not recognized after installing
+## Boot device not recognized after installing ##
-------------------------------------------
 
 Some firmware will not recognize the default Qubes EFI configuration.
 As such, it will have to be manually edited to be bootable.
@@ -202,8 +219,7 @@ This will need to be done after every kernel and Xen update to ensure you use th
        cp /boot/efi/EFI/qubes/xen-4.8.3.efi /boot/efi/EFI/BOOT/BOOTX64.efi
 
 
-Installation finished but "Qubes" boot option is missing and xen.cfg is empty
+## Installation finished but "Qubes" boot option is missing and xen.cfg is empty / Installation fails with "failed to set new efi boot target" ##
---------------------------------------------------------------------------------------
 
 In some cases installer fails to finish EFI setup and leave the system without a Qubes-specific EFI configuration.
 In such a case you need to finish those parts manually.
@@ -237,8 +253,7 @@ You can do that just after installation (switch to `tty2` with Ctrl-Alt-F2), or
        efibootmgr -v -c -u -L Qubes -l /EFI/qubes/xen.efi -d /dev/sda -p 1 "placeholder /mapbs /noexitboot"
 
 
-Accessing installer Rescue mode on UEFI
+## Accessing installer Rescue mode on UEFI ##
----------------------------------------
 
 In UEFI mode, the installer does not have a boot menu, but boots directly into the installation wizard.
 To get into Rescue mode, you need to switch to tty2 (Ctrl+Alt+F2) and then execute: