diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-06-05 09:15:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-06-05 11:04:01 +0200 |
| commit | 7a8aa0ec0a0be34670a9bdd9b190e0704257afeb (patch) | |
| tree | c982a6fb7e56a3c0a7b62431f13229e474badce9 /man/systemd-nspawn.xml | |
| parent | travis: use Fedora 27 as a base image (diff) | |
| download | systemd-7a8aa0ec0a0be34670a9bdd9b190e0704257afeb.tar.xz systemd-7a8aa0ec0a0be34670a9bdd9b190e0704257afeb.zip | |
man: use entities for fedora number and update URL
Fedora 28 is out already, let's advertise it. While at it, drop "container"
from "f28container" — it's a subdirectory under /var/lib/machines, it's pretty
obvious that's it a container.
To make the switch easier in the future, define the number as an entity.
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 1c8c6c8e60..f15ce2eb92 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY fedora_latest_version "28"> +<!ENTITY fedora_cloud_release "1.1"> +]> <!-- SPDX-License-Identifier: LGPL-2.1+ @@ -1191,8 +1194,8 @@ <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title> <programlisting># machinectl pull-raw --verify=no \ - https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz -# systemd-nspawn -M Fedora-Cloud-Base-25-1.3.x86_64.raw</programlisting> + https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz +# systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting> <para>This downloads an image using <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> @@ -1202,17 +1205,17 @@ <example> <title>Build and boot a minimal Fedora distribution in a container</title> - <programlisting># dnf -y --releasever=27 --installroot=/var/lib/machines/f27container \ + <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \ --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \ systemd passwd dnf fedora-release vim-minimal -# systemd-nspawn -bD /var/lib/machines/f27container</programlisting> +# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting> <para>This installs a minimal Fedora distribution into the - directory <filename noindex='true'>/var/lib/machines/f27container</filename> + directory <filename noindex='true'>/var/lib/machines/f&fedora_latest_version;</filename> and then boots an OS in a namespace container in it. Because the installation is located underneath the standard <filename>/var/lib/machines/</filename> directory, it is also possible to start the machine using - <command>systemd-nspawn -M f27container</command>.</para> + <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para> </example> <example> |