diff --git a/common-tasks/usb.md b/common-tasks/usb.md index e0141521..02eba04a 100644 --- a/common-tasks/usb.md +++ b/common-tasks/usb.md @@ -198,6 +198,6 @@ Additional Reading: [1082]: https://github.com/QubesOS/qubes-issues/issues/1082 [usb-challenges]: https://blog.invisiblethings.org/2011/05/31/usb-security-challenges.html [YubiKey]: /doc/YubiKey/ -[Creating a USB qube]: /doc/usb-qube-how-to/ -[Using a USB keyboard]: /doc/usb-qube-how-to/#enable-a-usb-keyboard-for-login +[Creating a USB qube]: /doc/usb-qube-howto/ +[Using a USB keyboard]: /doc/usb-qube-howto/#enable-a-usb-keyboard-for-login [qubes-usb-proxy]: https://github.com/QubesOS/qubes-app-linux-usb-proxy diff --git a/configuration/usb-qube-howto.md b/configuration/usb-qube-howto.md index 6d3815cd..c48eb822 100644 --- a/configuration/usb-qube-howto.md +++ b/configuration/usb-qube-howto.md @@ -1,7 +1,7 @@ --- layout: doc title: USB Qube HowTo -permalink: /doc/usb-qube-how-to/ +permalink: /doc/usb-qube-howto/ --- USB Qube HowTo @@ -198,9 +198,9 @@ Removing a USB qube [PCI Devices]: /doc/pci-devices-in-qubes-R4.0/ [usb-controller]: /doc/usb-devices/#finding-the-right-usb-controller [faq]: /faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot -[Security Warning about USB Input Devices]: /doc/device-considerations/#security-warning-on-usb-input-device +[Security Warning about USB Input Devices]: /doc/device-considerations/#security-warning-on-usb-input-devices [manual setup]: #manual-setup -[install dom0 updates]: /doc/software-update-dom0/#how-to-update-software-in-dom0 +[install dom0 updates]: /doc/software-update-dom0/#how-to-update-dom0 [hiding USB controllers from dom0]: #how-to-hide-all-usb-controllers-from-dom0 [AEM]: /doc/anti-evil-maid/ [create a USB qube]: #creating-and-using-a-usb-qube \ No newline at end of file diff --git a/customization/disposablevm-customization.md b/customization/disposablevm-customization.md index e57456a4..21cfcb62 100644 --- a/customization/disposablevm-customization.md +++ b/customization/disposablevm-customization.md @@ -91,8 +91,8 @@ For example, with `qvm-prefs work netvm sys-firewall2`. To create one with a PCI device attached such as for `sys-net` or `sys-usb`, use the additional commands as follows. -**Note** You can use `qvm-pci` to [determine](/doc/assigning-devices/#r40) the ``. -Also, you will often need to include the `-o no-strict-reset=True` [option](/doc/assigning-devices/#r40-1) with USB controllers. +**Note** You can use `qvm-pci` to [determine](/doc/pci-devices/#qvm-pci-usage) the ``. +Also, you will often need to include the `-o no-strict-reset=True` [option](/doc/pci-devices/#no-strict-reset) with USB controllers. ~~~ qvm-create -C DispVM -l red @@ -240,7 +240,7 @@ Using DisposableVMs in this manner is ideal for untrusted qubes which require pe 5. Attach the USB controller to the `disp-sys-usb` - >_**Note:**_ Most of the commonly used USB controllers (all Intel integrated controllers) require the `-o no-strict-reset=True` option to be set. Instructions detailing how this option is set can be found [here](/doc/assigning-devices/#r40-1). + >_**Note:**_ Most of the commonly used USB controllers (all Intel integrated controllers) require the `-o no-strict-reset=True` option to be set. Instructions detailing how this option is set can be found [here](/doc/pci-devices/#no-strict-reset). [user@dom0 ~]$ qvm-pci attach --persistent disp-sys-usb : @@ -248,7 +248,7 @@ Using DisposableVMs in this manner is ideal for untrusted qubes which require pe [user@dom0 ~]$ qvm-prefs disp-sys-usb autostart true -7. Users should now follow instructions on [How to hide USB controllers from dom0](/doc/usb/#how-to-hide-all-usb-controllers-from-dom0) +7. Users should now follow instructions on [How to hide USB controllers from dom0](/doc/usb-qube-howto/#how-to-hide-all-usb-controllers-from-dom0) 8. At this point, your mouse may not work. Edit the `qubes.InputMouse` policy file in dom0, which is located here: @@ -273,7 +273,7 @@ Prior to starting the new VMs, users should ensure that no other VMs such as the The `disp-sys-usb` VM does not start -If the `disp-sys-usb` does not start, it could be due to a PCI passthrough problem. For more details on this issue along with possible solutions, users can look [here](/doc/assigning-devices/#pci-passthrough-issues) +If the `disp-sys-usb` does not start, it could be due to a PCI passthrough problem. For more details on this issue along with possible solutions, users can look [here](/doc/pci-devices/#pci-passthrough-issues) ### Deleting DisposableVM ### diff --git a/doc.md b/doc.md index fd7078ab..440a4dcd 100644 --- a/doc.md +++ b/doc.md @@ -67,8 +67,7 @@ redirect_from: * [Backup, Restoration, and Migration](/doc/backup-restore/) * [Using DisposableVMs](/doc/disposablevm/) * [Using and Managing USB Devices in R3.2](/doc/usb/) - * [Using Block or Storage Devices in Qubes R4.0](/doc/block-devices/) - * [Using USB Devices in Qubes R4.0](/doc/usb-devices) + * [Using USB and Storage Devices in Qubes R4.0](/doc/usb-devices) * [Optical Discs](/doc/optical-discs/) * [Managing Application Shortcuts](/doc/managing-appvm-shortcuts/) * [Enabling Fullscreen Mode](/doc/full-screen-mode/) diff --git a/installing/install-security.md b/installing/install-security.md index 1eba07e3..2620efe9 100644 --- a/installing/install-security.md +++ b/installing/install-security.md @@ -83,6 +83,6 @@ switch might be the option. [verify]: /security/verifying-signatures/ [classic problem]: https://www.ece.cmu.edu/~ganger/712.fall02/papers/p761-thompson.pdf [solutions]: https://www.dwheeler.com/trusting-trust/ -[USB qube]: /doc/usb/#creating-and-using-a-usb-qube +[USB qube]: /doc/usb-qubes-howto/#creating-and-using-a-usb-qube [BadUSB]: https://srlabs.de/badusb/ diff --git a/security/yubi-key.md b/security/yubi-key.md index 0d12ddd3..f49ae067 100644 --- a/security/yubi-key.md +++ b/security/yubi-key.md @@ -11,7 +11,7 @@ Using YubiKey to Qubes authentication ===================================== You can use YubiKey to enhance Qubes user authentication, for example to mitigate -risk of snooping the password. This can also slightly improve security when you have [USB keyboard](/doc/usb/#security-warning-about-usb-input-devices). +risk of snooping the password. This can also slightly improve security when you have [USB keyboard](/doc/device-considerations/#security-warning-on-usb-input-devices). There (at least) two possible configurations: using OTP mode and using challenge-response mode.