From d8634ac814b9f5424da23ff49816b564352b6de3 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Fri, 19 Aug 2016 19:56:24 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20broken=20link=20to=20=E2=80=9CCompact?= =?UTF-8?q?ing=20templates=20root.img=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common-tasks/software-update-vm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tasks/software-update-vm.md b/common-tasks/software-update-vm.md index 12e8866b..235bd062 100644 --- a/common-tasks/software-update-vm.md +++ b/common-tasks/software-update-vm.md @@ -22,7 +22,7 @@ The default template is called **fedora-14-x64** in Qubes R1 and **fedora-20-x64 The side effect of this mechanism is, of course, that if you install any software in your AppVM, more specifically in any directory other than `/home` or `/usr/local` then it will disappear after the AppVM reboot (as the root filesystem for this AppVM will again be "taken" from the Template VM). **This means one normally install software in the Template VM, not in AppVMs.** -Unlike VM private filesystems, the template VM root filesystem does not support discard, so deleting files does not free the space in dom0. See [these instructions](/doc/FedoraTemplateUpgrade/#compacting-templates-rootimg) to recover space in dom0. +Unlike VM private filesystems, the template VM root filesystem does not support discard, so deleting files does not free the space in dom0. See [these instructions](/doc/fedora-template-upgrade-18/#compacting-templates-rootimg) to recover space in dom0. Installing (or updating) software in the template VM ---------------------------------------------------- From 182d1dff0fc6df369fd3a4aa14ea541f61b7fa78 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Fri, 19 Aug 2016 11:02:10 -0700 Subject: [PATCH 2/2] Use instructions for latest stable, supported template --- common-tasks/software-update-vm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tasks/software-update-vm.md b/common-tasks/software-update-vm.md index 235bd062..44f125fa 100644 --- a/common-tasks/software-update-vm.md +++ b/common-tasks/software-update-vm.md @@ -22,7 +22,7 @@ The default template is called **fedora-14-x64** in Qubes R1 and **fedora-20-x64 The side effect of this mechanism is, of course, that if you install any software in your AppVM, more specifically in any directory other than `/home` or `/usr/local` then it will disappear after the AppVM reboot (as the root filesystem for this AppVM will again be "taken" from the Template VM). **This means one normally install software in the Template VM, not in AppVMs.** -Unlike VM private filesystems, the template VM root filesystem does not support discard, so deleting files does not free the space in dom0. See [these instructions](/doc/fedora-template-upgrade-18/#compacting-templates-rootimg) to recover space in dom0. +Unlike VM private filesystems, the template VM root filesystem does not support discard, so deleting files does not free the space in dom0. See [these instructions](/doc/fedora-template-upgrade-21/#compacting-the-upgraded-template) to recover space in dom0. Installing (or updating) software in the template VM ----------------------------------------------------