From 0ddb556e8ec57e19fe32257ca71e619b223c1704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Mon, 28 Sep 2020 00:18:16 +0200 Subject: [PATCH] Update XFCE related templates --- external/os-guides/centos.md | 8 ++--- external/os-guides/gentoo.md | 8 ++--- user/managing-os/fedora/fedora-xfce.md | 32 ----------------- user/managing-os/fedora/fedora.md | 4 +-- user/managing-os/templates.md | 4 ++- user/managing-os/xfce-templates.md | 50 ++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 45 deletions(-) delete mode 100644 user/managing-os/fedora/fedora-xfce.md create mode 100644 user/managing-os/xfce-templates.md diff --git a/external/os-guides/centos.md b/external/os-guides/centos.md index 5b1c9d67..61595909 100644 --- a/external/os-guides/centos.md +++ b/external/os-guides/centos.md @@ -6,9 +6,7 @@ permalink: /doc/templates/centos/ # CentOS Template -If you would like to use a stable, predictable, manageable and reproducible distribution in your AppVMs, you can install the CentOS template, provided by Qubes in ready to use binary package. - -For the minimal version, please see [Minimal TemplateVMs](/doc/templates/minimal/) +If you would like to use a stable, predictable, manageable and reproducible distribution in your AppVMs, you can install the CentOS template, provided by Qubes in ready to use binary package. For the minimal and Xfce versions, please see the [Minimal TemplateVMs] and [Xfce TemplateVMs] pages. ## Installation @@ -32,5 +30,5 @@ After a fresh install, we recommend to [Update the TemplateVM](/doc/software-upd [switch]: /doc/templates/#switching [reinstall]: /doc/reinstall-template/ [uninstall]: /doc/templates/#uninstalling - - +[Minimal TemplateVMs]: /doc/templates/minimal/ +[Xfce TemplateVMs]: /doc/templates/xfce/ diff --git a/external/os-guides/gentoo.md b/external/os-guides/gentoo.md index 18f0e461..abed83c0 100644 --- a/external/os-guides/gentoo.md +++ b/external/os-guides/gentoo.md @@ -6,9 +6,7 @@ permalink: /doc/templates/gentoo/ # Gentoo Template -If you would like to use a stable, predictable, manageable and reproducible distribution in your AppVMs, you can install the Gentoo template, provided by Qubes in ready to use binary package. - -For the minimal version, please see [Minimal TemplateVMs](/doc/templates/minimal/) +If you would like to use a stable, predictable, manageable and reproducible distribution in your AppVMs, you can install the Gentoo template, provided by Qubes in ready to use binary package. For the minimal and Xfce versions, please see the [Minimal TemplateVMs] and [Xfce TemplateVMs] pages. ## Installation @@ -32,5 +30,5 @@ After a fresh install, we recommend to [Update the TemplateVM](/doc/software-upd [switch]: /doc/templates/#switching [reinstall]: /doc/reinstall-template/ [uninstall]: /doc/templates/#uninstalling - - +[Minimal TemplateVMs]: /doc/templates/minimal/ +[Xfce TemplateVMs]: /doc/templates/xfce/ diff --git a/user/managing-os/fedora/fedora-xfce.md b/user/managing-os/fedora/fedora-xfce.md deleted file mode 100644 index 5a758ee9..00000000 --- a/user/managing-os/fedora/fedora-xfce.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: doc -title: The Fedora Xfce TemplateVM -permalink: /doc/templates/fedora-xfce/ ---- - -The Fedora Xfce TemplateVM -===================== - -If you would like to use Fedora Xfce (more lightweight compared to GNOME desktop environment) Linux distribution in your qubes, you can install one of the available Fedora Xfce templates. - - -Installing ----------- - -To install a specific Fedora Xfce TemplateVM that is not currently installed in your system, use the following command in dom0: - - $ sudo qubes-dom0-update --enablerepo=qubes-templates-itl qubes-template-fedora-XX-xfce - - (Replace `XX` with the Fedora Xfce version number of the template you wish to install.) - -To reinstall a Fedora Xfce TemplateVM that is already installed in your system, see [How to Reinstall a TemplateVM]. - - -Upgrading ---------- - -To upgrade your Fedora TemplateVM, please see [Upgrading Fedora TemplateVMs]. - -[Upgrading Fedora TemplateVMs]: /doc/template/fedora/upgrade/ -[How to Reinstall a TemplateVM]: /doc/reinstall-template/ - diff --git a/user/managing-os/fedora/fedora.md b/user/managing-os/fedora/fedora.md index a7eb261b..e5673b9c 100644 --- a/user/managing-os/fedora/fedora.md +++ b/user/managing-os/fedora/fedora.md @@ -6,7 +6,7 @@ permalink: /doc/templates/fedora/ # The Fedora TemplateVM -The Fedora [TemplateVM] is the default TemplateVM in Qubes OS. This page is about the standard (or "full") Fedora TemplateVM. For the minimal and Xfce versions, please see the [Minimal TemplateVMs] and [Fedora Xfce] pages. +The Fedora [TemplateVM] is the default TemplateVM in Qubes OS. This page is about the standard (or "full") Fedora TemplateVM. For the minimal and Xfce versions, please see the [Minimal TemplateVMs] and [Xfce TemplateVMs] pages. ## Installing @@ -46,8 +46,8 @@ There are two ways to upgrade your TemplateVM to a new Fedora release: [TemplateVM]: /doc/templates/ -[Fedora Xfce]: /doc/templates/fedora-xfce/ [Minimal TemplateVMs]: /doc/templates/minimal/ +[Xfce TemplateVMs]: /doc/templates/xfce/ [end-of-life]: https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle#Maintenance_Schedule [supported]: /doc/supported-versions/#templatevms [How to Reinstall a TemplateVM]: /doc/reinstall-template/ diff --git a/user/managing-os/templates.md b/user/managing-os/templates.md index 839bf0a3..31c037d2 100644 --- a/user/managing-os/templates.md +++ b/user/managing-os/templates.md @@ -265,7 +265,7 @@ Note the word "clean" means in this context: the same as their template filesyst [TemplateBasedVMs]: /doc/glossary/#templatebasedvm [Fedora]: /doc/templates/fedora/ [Fedora Minimal]: /doc/templates/minimal/ -[Fedora Xfce]: /doc/templates/fedora-xfce +[Fedora Xfce]: /doc/templates/xfce [Debian]: /doc/templates/debian/ [Debian Minimal]: /doc/templates/minimal/ [Whonix]: /doc/templates/whonix/ @@ -273,8 +273,10 @@ Note the word "clean" means in this context: the same as their template filesyst [Arch Linux]: /doc/building-archlinux-template/ [CentOS]: /doc/templates/centos/ [CentOS Minimal]: /doc/templates/minimal/ +[CentOS Xfce]: /doc/templates/xfce [Gentoo]: /doc/templates/gentoo/ [Gentoo Minimal]: /doc/templates/minimal/ +[Gentoo Xfce]: /doc/templates/xfce [Qubes Builder]: /doc/qubes-builder/ [TemplateVM Implementation]: /doc/template-implementation/ [How to Remove VMs Manually]: /doc/remove-vm-manually/ diff --git a/user/managing-os/xfce-templates.md b/user/managing-os/xfce-templates.md new file mode 100644 index 00000000..4762b64f --- /dev/null +++ b/user/managing-os/xfce-templates.md @@ -0,0 +1,50 @@ +--- +layout: doc +title: Xfce TemplateVMs +permalink: /doc/templates/xfce/ +redirect_from: +- /doc/templates/xfce/ +- /doc/xfce/ +- /en/doc/templates/xfce/ +- /doc/Templates/Xfce/ +- /wiki/Templates/Xfce/ +--- + +# Xfce TemplateVMs + +If you would like to use Xfce (more lightweight compared to GNOME desktop environment) Linux distribution in your qubes, +you can install one of the available Xfce templates for [Fedora], [CentOS] or [Gentoo]. + + +## Installation + +The Fedora Xfce TemplateVMs can be installed with the following command (where `X` is your desired distro and version number): + + [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-X-xfce + +If your desired version is not found, it may still be in [testing]. +You may wish to try again with the testing repository enabled: + + [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-itl-testing qubes-template-X-xfce + +If you would like to install a community distribution, like CentOS or Gentoo, try the install command by enabling the community repository: + + [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community qubes-template-X-xfce + +If your desired version is not found, it may still be in [testing]. +You may wish to try again with the testing repository enabled: + + [user@dom0 ~]$ sudo qubes-dom0-update --enablerepo=qubes-templates-community-testing qubes-template-X-xfce + +The download may take a while depending on your connection speed. + +To reinstall a Xfce TemplateVM that is already installed in your system, see [How to Reinstall a TemplateVM]. + +[How to Reinstall a TemplateVM]: /doc/reinstall-template/ + +[TemplateVMs]: /doc/templates/ +[Fedora]: /doc/templates/fedora/ +[Debian]: /doc/templates/debian/ +[CentOS]: /doc/templates/centos/ +[Gentoo]: /doc/templates/gentoo/ +[testing]: /doc/testing/