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 | 55 |
1 files changed, 32 insertions, 23 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 9a8ce15ea..145e45d4b 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 @@ -1,15 +1,15 @@ -From 566cac15ed36506e2bb766313a5d4e0825bc6499 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@sbcglobal.net> +From 888c40a593c053c4af053fbe6ecd31c8c51f70c8 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:32:21 -0400 -Subject: [PATCH 6/6] FSDG: man/: Use FSDG operating systems as examples. +Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples --- man/os-release.xml | 49 +++++++++++++++++++++++++------------------------ - man/systemd-nspawn.xml | 37 +++++++++++++------------------------ - 2 files changed, 38 insertions(+), 48 deletions(-) + man/systemd-nspawn.xml | 34 ++++++++++++++++++---------------- + 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index caf60f4..2811f43 100644 +index caf60f41a..2811f434c 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -122,7 +122,7 @@ @@ -131,29 +131,38 @@ index caf60f4..2811f43 100644 <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index cd0a90d..ab35580 100644 +index ae7082776..ef80d90ba 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -1004,46 +1004,35 @@ +@@ -1048,10 +1048,11 @@ + <refsect1> <title>Examples</title> ++<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use. <example> -- <title>Download a Fedora image and start a shell in it</title> -+ <title>Build and boot a minimal BLAG distribution in a container</title> + <title>Download a Fedora image and start a shell in it</title> + +- <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> + +@@ -1059,39 +1060,40 @@ + <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> + and opens a shell in it.</para> + </example> ++--> -- <programlisting># machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz --# systemd-nspawn -M Fedora-Cloud-Base-24-1.2.x86_64.raw</programlisting> -- -- <para>This downloads an image using -- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> -- and opens a shell in it.</para> -- </example> -- -- <example> + <example> - <title>Build and boot a minimal Fedora distribution in a container</title> -- -- <programlisting># dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal -+ <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal ++ <title>Build and boot a minimal BLAG distribution in a container</title> + +- <programlisting># dnf -y --releasever=25 --installroot=/srv/mycontainer \ +- --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \ +- systemd passwd dnf fedora-release vim-minimal ++ <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer \ ++ --disablerepo='*' --enablerepo=blag --enablerepo=updates install \ ++ systemd passwd dnf blag-release vim-minimal # systemd-nspawn -bD /srv/mycontainer</programlisting> - <para>This installs a minimal Fedora distribution into the @@ -195,5 +204,5 @@ index cd0a90d..ab35580 100644 </example> -- -2.8.3 +2.13.2 |