From ae29a134666f4ca36bd1408af661c27d3f242905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 18 Feb 2019 23:43:18 +0100 Subject: [PATCH 1/2] Add a note about disp-* VMs creating when restoring R3.2 backup --- installing/upgrade/upgrade-to-r4.0.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/installing/upgrade/upgrade-to-r4.0.md b/installing/upgrade/upgrade-to-r4.0.md index 21a90c3c..f54d4e81 100644 --- a/installing/upgrade/upgrade-to-r4.0.md +++ b/installing/upgrade/upgrade-to-r4.0.md @@ -90,6 +90,22 @@ Restore from your backup For the TemplateVM OS versions supported in R4.0, see [Supported Versions](/doc/supported-versions/#templatevms). If the restore tool complains about missing templates, you can select the option to restore the AppVMs anyway, then change them afterward to use one of the default R4.0 templates. +Note about additional disp-\* qubes created during restore +---------------------------------------------------------- + +One of differences between R3.2 and R4.0 is handling Disposable qubes. +In R3.2, Disposable qube inherited its network settings (netvm, firewall rules) from the calling qube. +In R4.0 it is no longer the case. +Instead, in R4.0 it's possible to create multiple DVM templates and choose which one should be used by each qube. +It's even possible to use different DVM templates for different operations from the same qube. +This allows much more flexibility, as not only network settings can be differentiated, but all the qubes properties (including template, memory settings etc). + +Restoring a backup from R3.2 preserve the old behavior by creating separate DVM template for each network-providing VM (and also `disp-no-netvm` for network-isolated qubes). +Then, each restored qubes are configured to use appropriate DVM template, according to its `netvm` or `dispvm_netvm` property from R3.2. +This way, DispVMs started on R4.0 by qubes restored from R3.2 backup have the same netvm settings as they had on R3.2. + +If this behavior is undesired for you, or you want to configure it differently, you can remove those `disp-*` DVM templates. +But to do so, you first need make sure they are not set for any `default_dispvm` property anywhere. Both Qubes Manager and `qvm-remove` tool will show you where such DVM template is used, so you can go there and change the setting. Upgrade all Template and Standalone VM(s) ----------------------------------------- From 30b72d8913fa1d997cd8a7ccfd082c09e6a1ae2e Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Mon, 18 Feb 2019 23:38:53 -0600 Subject: [PATCH 2/2] Improve clarity, grammar, and orthography --- installing/upgrade/upgrade-to-r4.0.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/installing/upgrade/upgrade-to-r4.0.md b/installing/upgrade/upgrade-to-r4.0.md index f54d4e81..003c2091 100644 --- a/installing/upgrade/upgrade-to-r4.0.md +++ b/installing/upgrade/upgrade-to-r4.0.md @@ -90,22 +90,23 @@ Restore from your backup For the TemplateVM OS versions supported in R4.0, see [Supported Versions](/doc/supported-versions/#templatevms). If the restore tool complains about missing templates, you can select the option to restore the AppVMs anyway, then change them afterward to use one of the default R4.0 templates. -Note about additional disp-\* qubes created during restore ----------------------------------------------------------- +Note about additional disp-* qubes created during restore +--------------------------------------------------------- -One of differences between R3.2 and R4.0 is handling Disposable qubes. -In R3.2, Disposable qube inherited its network settings (netvm, firewall rules) from the calling qube. -In R4.0 it is no longer the case. -Instead, in R4.0 it's possible to create multiple DVM templates and choose which one should be used by each qube. -It's even possible to use different DVM templates for different operations from the same qube. -This allows much more flexibility, as not only network settings can be differentiated, but all the qubes properties (including template, memory settings etc). +One of differences between R3.2 and R4.0 is the handling of DisposableVMs. +In R3.2, a DisposableVM inherited its network settings (NetVM and firewall rules) from the calling qube. +In R4.0, this is no longer the case. +Instead, in R4.0 it's possible to create multiple DVM Templates and choose which one should be used by each qube. +It's even possible to use different DVM Templates for different operations from the same qube. +This allows much more flexibility, since it allows you to differentiate not only network settings, but all of a qube's properties (including its template, memory settings, etc.). -Restoring a backup from R3.2 preserve the old behavior by creating separate DVM template for each network-providing VM (and also `disp-no-netvm` for network-isolated qubes). -Then, each restored qubes are configured to use appropriate DVM template, according to its `netvm` or `dispvm_netvm` property from R3.2. -This way, DispVMs started on R4.0 by qubes restored from R3.2 backup have the same netvm settings as they had on R3.2. +Restoring a backup from R3.2 preserves the old behavior by creating separate DVM Template for each network-providing qube (and also `disp-no-netvm` for network-isolated qubes). +Then, each restored qube is configured to use the appropriate DVM Template according to its `netvm` or `dispvm_netvm` property from R3.2. +This way, DisposableVMs started on R4.0 by qubes restored from a R3.2 backup have the same NetVM settings as they had on R3.2. -If this behavior is undesired for you, or you want to configure it differently, you can remove those `disp-*` DVM templates. -But to do so, you first need make sure they are not set for any `default_dispvm` property anywhere. Both Qubes Manager and `qvm-remove` tool will show you where such DVM template is used, so you can go there and change the setting. +If you find this behavior undesirable and want to configure it differently, you can remove those `disp-*` DVM Templates. +But, to do so, you must first make sure they are not set as the value for the `default_dispvm` property on any other qube. +Both Qubes Manager and the `qvm-remove` tool will show you where a DVM Template is being used, so you can go there and change the setting. Upgrade all Template and Standalone VM(s) -----------------------------------------