From 8b6bc6da81921c6396e24a0043810f77e14571ea Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Thu, 19 Sep 2019 21:44:21 -0500 Subject: [PATCH] Clarify and reorganize section on reverting template changes Thank you to Demi M. Obenour and Simon Gaiser for providing this information. --- user/common-tasks/software-update-domu.md | 71 ++++++++++++++++------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/user/common-tasks/software-update-domu.md b/user/common-tasks/software-update-domu.md index ccc83b2e..f4418ca5 100644 --- a/user/common-tasks/software-update-domu.md +++ b/user/common-tasks/software-update-domu.md @@ -75,26 +75,6 @@ Debian also has three Qubes VM testing repositories (where `*` denotes the Relea To enable or disable any of these repos permanently, uncomment the corresponding `deb` line in `/etc/apt/sources.list.d/qubes-r*.list` -## Reverting changes to a TemplateVM - -Perhaps you've just updated your TemplateVM, and the update broke your template. -Or perhaps you've made a terrible mistake, like accidentally confirming the installation of an unsigned package that could be malicious. -Fortunately, it's easy to revert changes to TemplateVMs using the command appropriate to your version of Qubes. - -**Important:** This command will roll back any changes made *during the last time the TemplateVM was run, but **not** before.* -This means that if you have already restarted the TemplateVM, using this command is unlikely to help, and you'll likely want to reinstall it from the repository instead. -On the other hand, if the template is already broken or compromised, it won't hurt to try reverting first. -Just make sure to **back up** all of your data and changes first! - -For example, to revert changes to the `fedora-XX` TemplateVM (where `XX` is your Fedora version): - -1. Shut down `fedora-XX`. - If you've already just shut it down, do **not** start it again (see above). -2. In a dom0 terminal, type: - - qvm-volume revert fedora-XX:root - - ## StandaloneVMs When you create a [StandaloneVM] from a TemplateVM, the StandaloneVM is a complete clone of the TemplateVM, including the entire filesystem. @@ -119,6 +99,56 @@ sudo dnf upgrade --refresh ~~~ +## Reverting changes to a TemplateVM + +Perhaps you've just updated your TemplateVM, and the update broke your template. +Or perhaps you've made a terrible mistake, like accidentally confirming the installation of an unsigned package that could be malicious. +If you want to undo changes to a TemplateVM, there are three basic methods: + +1. **Root revert.** + This is appropriate for misconfigurations, but not for security concerns. + It will preserve your customizations. + +2. **Reinstall the template.** + This is appropriate for both misconfigurations and security concerns, but you will lose all customizations. + +3. **Full revert.** + This is appropriate for both misconfigurations and security concerns, and it can preserve your customizations. + However, it is a bit more complex. + + +### Root revert + +**Important:** This command will roll back any changes made *during the last time the TemplateVM was run, but **not** before.* +This means that if you have already restarted the TemplateVM, using this command is unlikely to help, and you'll likely want to reinstall it from the repository instead. +On the other hand, if the template is already broken or compromised, it won't hurt to try reverting first. +Just make sure to **back up** all of your data and changes first! + +1. Shut down `