From d3721468193d8427784bcad92f1fb627c7b3e5c6 Mon Sep 17 00:00:00 2001 From: crazyqube <54180070+crazyqube@users.noreply.github.com> Date: Sat, 24 Aug 2019 09:48:00 +0000 Subject: [PATCH 01/10] Make note of viable option for non-experts Any novice computer user will struggle to implement the steps provided. Give them and people who don't have the time to do it manually a viable option. --- os-guides/windows/windows-vm.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/os-guides/windows/windows-vm.md b/os-guides/windows/windows-vm.md index c90fe01..5e885d6 100644 --- a/os-guides/windows/windows-vm.md +++ b/os-guides/windows/windows-vm.md @@ -82,6 +82,10 @@ Note however that you are better off creating a new Windows VM to benefit from t Windows VM installation ----------------------- +### qvm-create-windows-qube ### + +A tool for automating this process is available [here](https://github.com/crazyqube/qvm-create-windows-qube). However, if you are an expert or want to do it manually you may continue below. + ### Summary ### ~~~ From dd66518b14fdc53dcf75e511afa8c51a4e0b7886 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 25 Aug 2019 11:15:42 -0500 Subject: [PATCH 02/10] Note that the tool is unofficial and third-party --- os-guides/windows/windows-vm.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/os-guides/windows/windows-vm.md b/os-guides/windows/windows-vm.md index 5e885d6..9a66a01 100644 --- a/os-guides/windows/windows-vm.md +++ b/os-guides/windows/windows-vm.md @@ -84,7 +84,8 @@ Windows VM installation ### qvm-create-windows-qube ### -A tool for automating this process is available [here](https://github.com/crazyqube/qvm-create-windows-qube). However, if you are an expert or want to do it manually you may continue below. +An unofficial, third-party tool for automating this process is available [here](https://github.com/crazyqube/qvm-create-windows-qube). +However, if you are an expert or want to do it manually you may continue below. ### Summary ### From 1069c195408efec2d3b8d97037fd6194827faa7e Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 28 Aug 2019 16:53:12 -0500 Subject: [PATCH 03/10] Add a more explicit disclaimer --- os-guides/windows/windows-vm.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/os-guides/windows/windows-vm.md b/os-guides/windows/windows-vm.md index 9a66a01..f78fb0f 100644 --- a/os-guides/windows/windows-vm.md +++ b/os-guides/windows/windows-vm.md @@ -85,6 +85,8 @@ Windows VM installation ### qvm-create-windows-qube ### An unofficial, third-party tool for automating this process is available [here](https://github.com/crazyqube/qvm-create-windows-qube). +(Please note that this tool has not been reviewed by the Qubes OS Project. +Use it at your own risk.) However, if you are an expert or want to do it manually you may continue below. ### Summary ### From 87bf24916f5582659662fcd44d0f00db6798714a Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sat, 31 Aug 2019 19:38:15 -0500 Subject: [PATCH 04/10] Update reference to qvm-trim-template for R4+ Fixes QubesOS/qubes-issues#5260 --- configuration-guides/tips-and-tricks.md | 7 ------- os-guides/pentesting/kali.md | 13 +++---------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/configuration-guides/tips-and-tricks.md b/configuration-guides/tips-and-tricks.md index f341998..f937b32 100644 --- a/configuration-guides/tips-and-tricks.md +++ b/configuration-guides/tips-and-tricks.md @@ -53,10 +53,3 @@ This applies also to any TemplateBasedVM relative to its parent TemplateVM, but Credit: [Joanna Rutkovska](https://twitter.com/rootkovska/status/832571372085850112) - -Trim for standalone AppVMs ---------------------- -The `qvm-trim-template` command is not available for a standalone AppVM. - -It is still possible to trim the AppVM disks by using the `fstrim --all` command from the appvm. -You can also add the `discard` option to the mount line in `/etc/fstab` inside the standalone AppVM if you want trimming to be performed automatically, but there may be a performance impact on writes and deletes. diff --git a/os-guides/pentesting/kali.md b/os-guides/pentesting/kali.md index 08e0336..5cda6f7 100644 --- a/os-guides/pentesting/kali.md +++ b/os-guides/pentesting/kali.md @@ -148,15 +148,9 @@ There are multiple ways to create a Kali Linux VM: [user@kali ~]$ sudo apt-get dist-upgrade [user@kali ~]$ sudo apt-get autoremove -8. Shutdown and trim `kali` template +8. Shut down `kali` template - - Shutdown `kali` template - - [user@kali ~]$ sudo shutdown -h now - - - In `dom0` console: - - [user@dom0 ~]$ qvm-trim-template kali + [user@kali ~]$ sudo shutdown -h now 9. Start image @@ -285,10 +279,9 @@ These instructions will show you how to upgrade a Debian TemplateVM to Kali Linu [user@kali-rolling ~]$ sudo apt-get dist-upgrade [user@kali-rolling ~]$ sudo apt-get autoremove -9. Shut down and trim the new template. +9. Shut down the new template. [user@dom0 ~]$ qvm-shutdown kali-rolling - [user@dom0 ~]$ qvm-trim-template kali-rolling 10. Ensure a terminal can be opened in the new template. From 393681c401f6a9189c1f7838c5ea15e46c472f4b Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Mon, 2 Sep 2019 05:03:21 -0500 Subject: [PATCH 05/10] Fix links --- os-guides/windows/windows-vm.md | 2 +- troubleshooting/remove-vm-manually.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/os-guides/windows/windows-vm.md b/os-guides/windows/windows-vm.md index c90fe01..3c8be14 100644 --- a/os-guides/windows/windows-vm.md +++ b/os-guides/windows/windows-vm.md @@ -162,7 +162,7 @@ To avoid that error we temporarily have to switch the video adapter to 'cirrus': qvm-features win7new video-model cirrus ~~~ -The VM is now ready to be started; the best practice is to use an installation ISO [located in a VM](/doc/hvm/#installing-an-os-in-an-hvm-qube): +The VM is now ready to be started; the best practice is to use an installation ISO [located in a VM](/doc/standalone-and-hvm/#installing-an-os-in-an-hvm): ~~~ qvm-start --cdrom=untrusted:/home/user/windows_install.iso win7new diff --git a/troubleshooting/remove-vm-manually.md b/troubleshooting/remove-vm-manually.md index 7d8d52b..fbc1c14 100644 --- a/troubleshooting/remove-vm-manually.md +++ b/troubleshooting/remove-vm-manually.md @@ -32,5 +32,5 @@ When a template is marked as 'installed by package manager', but cannot be unins - If `installed_by_rpm` remains `True`, reboot your computer to bring qubes.xml in sync with qubesd, and try again to remove the template. -[normal method]: /doc/templates/#how-to-install-uninstall-reinstall-and-switch +[normal method]: /doc/templates/#uninstalling From 59d12e8be8ef6639fda94dc7139fe680f8918b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hro=C3=B0gar=20Skj=C3=B6ldung?= Date: Thu, 5 Sep 2019 14:54:49 -0400 Subject: [PATCH 06/10] --hvm not an option, use --property virt_mode=mvh --- os-guides/windows/windows-tools.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os-guides/windows/windows-tools.md b/os-guides/windows/windows-tools.md index 19aea38..feaf954 100644 --- a/os-guides/windows/windows-tools.md +++ b/os-guides/windows/windows-tools.md @@ -153,6 +153,6 @@ Then, periodically check for updates in the Template VM and the changes will be Once the template has been created and installed it is easy to create AppVMs based on it: ~~~ -qvm-create --hvm --template --label