From 9abdb86f5dff35c13a3602a5de53e8673b10ecf3 Mon Sep 17 00:00:00 2001 From: Inventor Date: Sat, 28 Oct 2017 22:11:21 -0400 Subject: [PATCH 1/5] Update usb.md --- common-tasks/usb.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common-tasks/usb.md b/common-tasks/usb.md index 24f4d5dc..2e32005d 100644 --- a/common-tasks/usb.md +++ b/common-tasks/usb.md @@ -50,6 +50,8 @@ steps as root in dom0: qubesctl state.highstate +**Warning:** This has the potential to prevent you from connecting a keyboard to Qubes via USB. There are problems with doing this with a encrypted install (LUKS). If you find yourself in this situation, see this [issue][2270-comm23] + Alternatively, you can create a USB qube manually as follows: 1. Read the [Assigning Devices] page to learn how to list and identify your @@ -378,6 +380,7 @@ This feature is not yet available in Qubes Manager however, if you would like to [623]: https://github.com/QubesOS/qubes-issues/issues/623 [1072-comm1]: https://github.com/QubesOS/qubes-issues/issues/1072#issuecomment-124270051 [1072-comm2]: https://github.com/QubesOS/qubes-issues/issues/1072#issuecomment-124119309 +[2270-comm23]:https://github.com/QubesOS/qubes-issues/issues/2270#issuecomment-340230674 [1082]: https://github.com/QubesOS/qubes-issues/issues/1082 [hide-usb]: #how-to-hide-all-usb-controllers-from-dom0 [faq-usbvm]: /doc/user-faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot From 536e8e0bec23668b66e8b876bb9d4e6089d05d82 Mon Sep 17 00:00:00 2001 From: Inventor Date: Sat, 28 Oct 2017 22:16:50 -0400 Subject: [PATCH 2/5] Warning for usb-vm creation Added a warning to ensure that people don't get locked out of Qubes without adequate warning and a guide to getting them out of it. --- common-tasks/usb.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common-tasks/usb.md b/common-tasks/usb.md index 2e32005d..53663593 100644 --- a/common-tasks/usb.md +++ b/common-tasks/usb.md @@ -24,6 +24,8 @@ Using and Managing USB Devices Creating and Using a USB qube ----------------------------- +**Warning:** This has the potential to prevent you from connecting a keyboard to Qubes via USB. There are problems with doing this with a encrypted install (LUKS). If you find yourself in this situation, see this [issue][2270-comm23] + The connection of an untrusted USB device to dom0 is a security risk since dom0, like almost every OS, reads partition tables automatically and since the whole USB stack is put to work to parse the data presented by the USB device in order @@ -50,8 +52,6 @@ steps as root in dom0: qubesctl state.highstate -**Warning:** This has the potential to prevent you from connecting a keyboard to Qubes via USB. There are problems with doing this with a encrypted install (LUKS). If you find yourself in this situation, see this [issue][2270-comm23] - Alternatively, you can create a USB qube manually as follows: 1. Read the [Assigning Devices] page to learn how to list and identify your From ae905bc17adaf25bdabd48fa9d5788f2c19cf8cd Mon Sep 17 00:00:00 2001 From: Inventor Date: Sat, 28 Oct 2017 22:17:08 -0400 Subject: [PATCH 3/5] Added period --- common-tasks/usb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tasks/usb.md b/common-tasks/usb.md index 53663593..ff882c1a 100644 --- a/common-tasks/usb.md +++ b/common-tasks/usb.md @@ -24,7 +24,7 @@ Using and Managing USB Devices Creating and Using a USB qube ----------------------------- -**Warning:** This has the potential to prevent you from connecting a keyboard to Qubes via USB. There are problems with doing this with a encrypted install (LUKS). If you find yourself in this situation, see this [issue][2270-comm23] +**Warning:** This has the potential to prevent you from connecting a keyboard to Qubes via USB. There are problems with doing this with a encrypted install (LUKS). If you find yourself in this situation, see this [issue][2270-comm23]. The connection of an untrusted USB device to dom0 is a security risk since dom0, like almost every OS, reads partition tables automatically and since the whole From ea70a064d0ceffadb76f60fcbde0fda63c932f30 Mon Sep 17 00:00:00 2001 From: Inventor Date: Sun, 29 Oct 2017 10:00:13 -0400 Subject: [PATCH 4/5] Changed github issues link --- common-tasks/usb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tasks/usb.md b/common-tasks/usb.md index ff882c1a..bfd935fd 100644 --- a/common-tasks/usb.md +++ b/common-tasks/usb.md @@ -380,7 +380,7 @@ This feature is not yet available in Qubes Manager however, if you would like to [623]: https://github.com/QubesOS/qubes-issues/issues/623 [1072-comm1]: https://github.com/QubesOS/qubes-issues/issues/1072#issuecomment-124270051 [1072-comm2]: https://github.com/QubesOS/qubes-issues/issues/1072#issuecomment-124119309 -[2270-comm23]:https://github.com/QubesOS/qubes-issues/issues/2270#issuecomment-340230674 +[2270-comm23]: https://github.com/QubesOS/qubes-issues/issues/2270#issuecomment-242900312 [1082]: https://github.com/QubesOS/qubes-issues/issues/1082 [hide-usb]: #how-to-hide-all-usb-controllers-from-dom0 [faq-usbvm]: /doc/user-faq/#i-created-a-usbvm-and-assigned-usb-controllers-to-it-now-the-usbvm-wont-boot From 853ffc7c489f3a233a1f8293c80c6f84271f2e54 Mon Sep 17 00:00:00 2001 From: Inventor Date: Sun, 29 Oct 2017 11:07:40 -0400 Subject: [PATCH 5/5] Added missing colon --- common-tasks/usb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tasks/usb.md b/common-tasks/usb.md index bfd935fd..0b221dc2 100644 --- a/common-tasks/usb.md +++ b/common-tasks/usb.md @@ -112,7 +112,7 @@ opt to create a USB qube during installation. This also occurs automatically if you choose to [create a USB qube] using the `qubesctl` method, which is the first pair of steps in the linked section.) -**Warning** USB keyboard cannot be used to type the disk passphrase +**Warning:** USB keyboard cannot be used to type the disk passphrase if USB controllers were hidden from dom0. Before hiding USB controllers make sure your laptop keyboard is not internally connected via USB (by checking output of `lsusb` command) or that you have a PS/2 keyboard at hand