diff options
Diffstat (limited to 'libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch')
| -rw-r--r-- | libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 209683b08..0616b9296 100644 --- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -134,6 +134,15 @@ diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 633d93938..fd9db974d 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml +@@ -1,7 +1,7 @@ + <?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" [ +-<!ENTITY fedora_latest_version "28"> ++<!ENTITY blag_latest_version "140"> + <!ENTITY fedora_cloud_release "1.1"> + ]> + @@ -1078,11 +1078,12 @@ <refsect1> <title>Examples</title> @@ -145,8 +154,8 @@ index 633d93938..fd9db974d 100644 - <programlisting># machinectl pull-raw --verify=no \ + <programlisting># machinectl pull-raw -&2D;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> @@ -1090,31 +1091,32 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> @@ -158,24 +167,24 @@ index 633d93938..fd9db974d 100644 - <title>Build and boot a minimal Fedora distribution in a container</title> + <title>Build and boot a minimal BLAG 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> -+ <programlisting># dnf -y --releasever=140k --installroot=/var/lib/machines/blag140container \ +-# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting> ++ <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \ + --disablerepo='*' --enablerepo=blag --enablerepo=updates install \ + systemd passwd dnf blag-release vim-minimal -+# systemd-nspawn -bD /var/lib/machines/blag140container</programlisting> ++# systemd-nspawn -bD /var/lib/machines/blag&blag_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> + <para>This installs a minimal BLAG distribution into the -+ directory <filename noindex='true'>/var/lib/machines/blag140container</filename> ++ directory <filename noindex='true'>/var/lib/machines/blag&blag_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 blag140container</command>.</para> +- <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para> ++ <command>systemd-nspawn -M blag&blag_latest_version;</command>.</para> </example> <example> |