From c380832af15b3651b1d5647209becbef7121622a Mon Sep 17 00:00:00 2001
From: awokd <34515595+awokd@users.noreply.github.com>
Date: Sat, 3 Feb 2018 23:37:46 +0000
Subject: [PATCH] 4.0 updates

Add root specific content moved from /doc/resize-disk-image
Add 4.0 content
Remove outdated (<R3.?) and duplicated content
---
 configuration/resize-root-disk-image.md | 70 +++++++++++++++----------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/configuration/resize-root-disk-image.md b/configuration/resize-root-disk-image.md
index bee7272f..630a1dcf 100644
--- a/configuration/resize-root-disk-image.md
+++ b/configuration/resize-root-disk-image.md
@@ -11,11 +11,49 @@ redirect_from:
 Resize Root Disk Image
 ----------------------
 
-The safest way to increase the size of `root.img` is to turn your TemplateVM into a StandaloneVM. Doing this means it will have it's own root filesystem *(StandaloneVMs use a copy of template, instead of smart sharing)*. To do this run `qvm-create --standalone` from `dom0` Konsole.
+### Template disk image 
 
-### Resize a StandaloneVM Root Image
+If you want install a lot of software in your TemplateVM, you may need to increase the amount of disk space your TemplateVM can use. See also additional information and caveats about [resizing private disk images](/doc/resize-disk-image/).
+*Make sure changes in the TemplateVM between reboots don't exceed 10G.*
 
-In `dom0` Konsole run the following command (replace the size and path):
+1.  Make sure that all the VMs based on this template are shut off (including netvms etc).
+2.  Resize root image using Qubes version specific procedure below.
+3.  If any netvm/proxyvm used by this template is based on it, set template's netvm to none.
+4.  Start the template.
+5.  Resize the filesystem using OS appropriate tools (Qubes will handle this automatically with Linux templates).
+6.  Verify available space in the template using `df -h` or OS specific tools.
+7.  Shutdown the template.
+8.  Restore original netvm setting (if changed), check firewall settings (setting netvm to none causes the firewall to reset to "block all")
+
+### Root disk image (R4.0)
+
+1048576 MiB is the maximum size which can be assigned to root storage through Qube Manager.
+
+To grow the root disk image of an AppVM beyond this limit, [qvm-volume](/doc/dom0-tools/qvm-volume/) can be used:
+
+~~~
+qvm-volume extend <vm_name>:root <size>
+~~~
+
+Note: Size is the target size (i.e. 4096MB or 16GB, ...), not the size to add to the existing disk.
+
+### Root disk image (R3.2)
+
+1048576 MB is the maximum size which can be assigned to root storage through Qubes Manager.
+
+To grow the root disk image of an AppVM beyond this limit, [qvm-grow-root](/doc/dom0-tools/qvm-grow-root/) can be used:
+
+~~~
+qvm-grow-root <vm-name> <size>
+~~~
+
+Note: Size is the target size (i.e. 4096MB or 16GB, ...), not the size to add to the existing disk. 
+
+### Resize a StandaloneVM Root Image (R3.2)
+
+Another way to increase the size of `root.img` is to turn your TemplateVM into a StandaloneVM. Doing this means it will have it's own root filesystem *(StandaloneVMs use a copy of template, instead of smart sharing)*. To do this run `qvm-create --standalone` from `dom0` console.
+
+In `dom0` console run the following command (replace the size and path):
 
 ~~~
 truncate -s 20G /var/lib/qubes/appvms/standalonevm/root.img
@@ -27,28 +65,4 @@ Then start Terminal for this StandaloneVM and run:
 sudo resize2fs /dev/mapper/dmroot
 ~~~
 
-Shutdown the StandaloneVM and you will have extended the size of it's `root.img`
-
-
-### Resize a TemplateVM Root Image
-
-Shut down the TemplateVM, as well as all VMs based on that template (since they
-share `root.img`).
-In `dom0` Konsole run the following command (replace the size and path):
-*Make sure changes in the TemplateVM between reboots didn't exceed 10G.*
-
-~~~
-truncate -s 20G /var/lib/qubes/vm-templates/fedora-21/root.img
-~~~
-
-Then start only the TemplateVM and run the following. Note that if you are
-resizing the TemplateVM used by, e.g., your NetVM, you may need to disable
-networking so when the TemplateVM is started, it does not autostart other VMs
-based on the same `root.img`. Otherwise you will get an error message `Nothing
-to do!`.
-
-~~~
-sudo resize2fs /dev/mapper/dmroot
-~~~
-
-Shutdown the TemplateVM and you will have extended the size of it's `root.img`.
+Shutdown the StandaloneVM and you will have extended the size of its `root.img`.