From 99fdbf29b4de0d65a6fea16b175dafb925c7d5e3 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sat, 29 Jul 2017 21:21:25 -0500 Subject: [PATCH] Update examples from fedora-24 to fedora-25 --- managing-os/reinstall-template.md | 4 ++-- managing-os/templates.md | 8 ++++---- managing-os/templates/fedora-minimal.md | 4 ++-- security/multifactor-authentication.md | 12 ++++++------ security/split-gpg.md | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/managing-os/reinstall-template.md b/managing-os/reinstall-template.md index d992a1ce..2ef65908 100644 --- a/managing-os/reinstall-template.md +++ b/managing-os/reinstall-template.md @@ -19,8 +19,8 @@ First, copy any files that you wish to keep from the TemplateVM's `/home` and $ sudo qubes-dom0-update --action=reinstall qubes-template-package-name Replace `qubes-template-package-name` with the name of the *package* of the -template you wish to reinstall. For example, use `qubes-template-fedora-24` if -you wish to reinstall the `fedora-24` template. Only one template can be +template you wish to reinstall. For example, use `qubes-template-fedora-25` if +you wish to reinstall the `fedora-25` template. Only one template can be reinstalled at a time. Note that Qubes may initially refuse to perform the reinstall if the exact revision of diff --git a/managing-os/templates.md b/managing-os/templates.md index 216991d9..3c2b3910 100644 --- a/managing-os/templates.md +++ b/managing-os/templates.md @@ -71,7 +71,7 @@ Important Notes update a template from dom0 (and thereby lose any user modifications in the existing template), you must first uninstall the existing template from dom0: - $ sudo yum remove qubes-template-fedora-24 + $ sudo yum remove qubes-template-fedora-25 * Standalone VMs using Template VMs as a basis can be created easily. These VMs receive a *copy* of the operating system and do not get automatically @@ -86,10 +86,10 @@ Important Notes * On XFCE based Dom0, a manual action may be required to remove the "Start Menu" sub-menu of the removed TemplateVM. For example, to remove a dangling sub-menu - for a removed "fedora-24" template, open a Dom0 Terminal and type: + for a removed "fedora-25" template, open a Dom0 Terminal and type: - $ rm ~/.local/share/applications/fedora-24-* + $ rm ~/.local/share/applications/fedora-25-* - Just make sure there are no other TemplateVMs whose names start with "fedora-24" + Just make sure there are no other TemplateVMs whose names start with "fedora-25" or else their menu items will be removed too. diff --git a/managing-os/templates/fedora-minimal.md b/managing-os/templates/fedora-minimal.md index 433e6e5c..0578a5ac 100644 --- a/managing-os/templates/fedora-minimal.md +++ b/managing-os/templates/fedora-minimal.md @@ -21,7 +21,7 @@ Installation The Fedora minimal template can be installed with the following command: ~~~ -[user@dom0 ~]$ sudo qubes-dom0-update qubes-template-fedora-24-minimal +[user@dom0 ~]$ sudo qubes-dom0-update qubes-template-fedora-25-minimal ~~~ The download may take a while depending on your connection speed. @@ -32,7 +32,7 @@ Duplication and first steps It is higly recommended to clone the original template, and make any changes in the clone instead of the original template. The following command clones the template. Replace `your-new-clone` with your desired name. ~~~ -[user@dom0 ~]$ qvm-clone fedora-24-minimal your-new-clone +[user@dom0 ~]$ qvm-clone fedora-25-minimal your-new-clone ~~~ You must start the template in order to customize it. diff --git a/security/multifactor-authentication.md b/security/multifactor-authentication.md index 9e935ab0..a60b3104 100644 --- a/security/multifactor-authentication.md +++ b/security/multifactor-authentication.md @@ -67,24 +67,24 @@ Optional Preparation Steps [minimal Fedora template][FedoraMinimal]. Get it if you haven't already done so: - [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-fedora-24-minimal + [user@dom0 ~]$ sudo qubes-dom0-update qubes-template-fedora-25-minimal 2. Since we'll be making some modifications, you may want to clone the minimal template: - [user@dom0 ~]$ qvm-clone fedora-24-minimal fedora-24-min-mfa + [user@dom0 ~]$ qvm-clone fedora-25-minimal fedora-25-min-mfa 3. Since this is going to be a minimal environment in which we run `oathtool` from the command line, we'll install only a couple of packages: - [user@fedora-24-min-mfa ~]$ su - - [user@fedora-24-min-mfa ~]# yum install oathtool vim-minimal - [user@fedora-24-min-mfa ~]$ poweroff + [user@fedora-25-min-mfa ~]$ su - + [user@fedora-25-min-mfa ~]# yum install oathtool vim-minimal + [user@fedora-25-min-mfa ~]$ poweroff 4. Create an AppVM and set it to use the TemplateVM we just created: [user@dom0 ~]$ qvm-create -l black mfa - [user@dom0 ~]$ qvm-prefs -s mfa template fedora-24-min-mfa + [user@dom0 ~]$ qvm-prefs -s mfa template fedora-25-min-mfa 5. Isolate the new AppVM from the network: diff --git a/security/split-gpg.md b/security/split-gpg.md index b0dc9baa..e66e22fd 100644 --- a/security/split-gpg.md +++ b/security/split-gpg.md @@ -90,7 +90,7 @@ package installed. For Fedora. - [user@fedora-24 ~]$ sudo yum install qubes-gpg-split + [user@fedora-25 ~]$ sudo yum install qubes-gpg-split Start with creating a dedicated AppVM for storing your keys (the GPG backend domain). It is recommended that this domain be network disconnected (set its