Create minimal template instructions for each version

The minimal template upgrade instructions still included the
`qvm-trim-template` command, which only works in R3.2. I've moved those
instructions into the R3.2 section and added new instructions using the
`fstrim` command in the R4.0 section.

I've also removed the section on differences between the standard and
minimal upgrade procedures, since the second point is no longer accurate
(e.g., `sudo` is installed by default in the minimal template on R3.2),
and the first point is not significant enough to merit keeping the
section.

https://github.com/QubesOS/qubes-doc/pull/505
https://github.com/QubesOS/qubes-issues/issues/3429
This commit is contained in:
Andrew David Wong 2018-01-07 14:35:42 -06:00
parent 38143618c1
commit 81463b8206
No known key found for this signature in database
GPG Key ID: 8CE137352A019A17

View File

@ -16,8 +16,8 @@ This instruction is about upgrading Fedora 25 to Fedora 26 template. The same
instructions can be used to upgrade Fedora 24 to Fedora 26 - simply start with
cloning fedora-24 instead of fedora-25.
Qubes 3.2: Main Instructions
----------------------------
Qubes 3.2 Instructions
----------------------
### Summary: Upgrading the Standard Fedora 25 Template to Fedora 26 ###
@ -171,8 +171,26 @@ StandaloneVM in order to compact it:
$ sudo fstrim -v -a
Qubes 4.0: Main Instructions
----------------------------
### Summary: Upgrading the Minimal Fedora 25 Template to Fedora 26 ###
**Note:** The prompt on each line indicates where each command should be entered
(`@dom0` or `@fedora-26`).
[user@dom0 ~]$ qvm-clone fedora-25-minimal fedora-26-minimal
[user@dom0 ~]$ qvm-run -u root -a fedora-26-minimal xterm
[root@fedora-26-minimal ~]# dnf clean all
[user@fedora-26-minimal ~]# dnf --releasever=26 --best --allowerasing distro-sync
(Shut down TemplateVM by any normal means.)
[user@dom0 ~]$ qvm-trim-template fedora-26-minimal
(If you encounter insufficient space issues, you may need to use the methods
described for the standard template above.)
Qubes 4.0 Instructions
----------------------
### Summary: Upgrading the Standard Fedora 25 Template to Fedora 26 ###
@ -308,9 +326,6 @@ The procedure for upgrading a StandaloneVM from Fedora 25 to Fedora 26 is the
same as for a TemplateVM.
The Minimal Template
--------------------
### Summary: Upgrading the Minimal Fedora 25 Template to Fedora 26 ###
**Note:** The prompt on each line indicates where each command should be entered
@ -320,28 +335,14 @@ The Minimal Template
[user@dom0 ~]$ qvm-run -u root -a fedora-26-minimal xterm
[root@fedora-26-minimal ~]# dnf clean all
[user@fedora-26-minimal ~]# dnf --releasever=26 --best --allowerasing distro-sync
[user@fedora-26-minimal ~]# fstrim -v /
(Shut down TemplateVM by any normal means.)
[user@dom0 ~]$ qvm-trim-template fedora-26-minimal
(If you encounter insufficient space issues, you may need to use the methods
described for the standard template above.)
### Differences Between the Standard and Minimal Upgrade Procedures ###
The procedure for upgrading the minimal template (or any template based on the
minimal template) is the same as the procedure for the standard template above,
**with the following exceptions**:
1. `gnome-terminal` is not installed by default. Unless you've installed it
(or another terminal emulator), use `xterm`. (Of course, you can also use
`xterm` for the standard template, if you prefer.)
2. `sudo` is not installed by default. Unless you've installed it, use
`qvm-run -u root -a fedora-26-minimal xterm` in dom0, as demonstrated above.
Additional Information
----------------------