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 | 56 |
1 files changed, 42 insertions, 14 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 c1b06119f..d14058763 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 @@ -137,19 +137,10 @@ index 272258b4e1..6cea40cb99 100644 <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 69558ac85c..a561fe9eb0 100644 +index 588924ee61..34ff6a7e96 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -1,7 +1,7 @@ - <?xml version='1.0'?> - <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ --<!ENTITY fedora_latest_version "32"> -+<!ENTITY blag_latest_version "140"> - <!ENTITY fedora_cloud_release "1.6"> - ]> - <!-- SPDX-License-Identifier: LGPL-2.1+ --> -@@ -1415,11 +1415,12 @@ +@@ -1461,11 +1461,12 @@ <refsect1> <title>Examples</title> @@ -163,7 +154,7 @@ index 69558ac85c..a561fe9eb0 100644 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 \ Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64</programlisting> -@@ -1428,37 +1429,36 @@ +@@ -1474,37 +1475,36 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and opens a shell in it.</para> </example> @@ -212,11 +203,11 @@ index 69558ac85c..a561fe9eb0 100644 - <ulink url="https://www.debian.org">Debian</ulink>, - <ulink url="https://www.ubuntu.com">Ubuntu</ulink>, - and <ulink url="https://www.tanglu.org">Tanglu</ulink> -+ <ulink url="https://www.debian.org">gNewSense</ulink> ++ <ulink url="http://www.gnewsense.org">gNewSense</ulink> out of the box, so the same command can be used to install any of those. For other distributions from the Debian family, a mirror has to be specified, see <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>. -@@ -1467,29 +1467,31 @@ +@@ -1513,29 +1513,31 @@ <example> <title>Boot a minimal @@ -256,6 +247,43 @@ index 69558ac85c..a561fe9eb0 100644 <example> <title>Boot into an ephemeral snapshot of the host system</title> +diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in +index 9963322fc9..4b71a4ab8f 100644 +--- a/man/custom-entities.ent.in ++++ b/man/custom-entities.ent.in +@@ -11,5 +11,4 @@ + <!ENTITY KILL_USER_PROCESSES @KILL_USER_PROCESSES_YES_NO@> + <!ENTITY DEBUGTTY @DEBUGTTY@> + <!ENTITY RC_LOCAL_PATH @RC_LOCAL_PATH@> +-<!ENTITY fedora_latest_version "33"> +-<!ENTITY fedora_cloud_release "1.2"> ++<!ENTITY blag_latest_version "140"> +diff --git a/man/machinectl.xml b/man/machinectl.xml +index 9026849559..7b3b130763 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -940,11 +940,12 @@ + to open a shell in it.</para> + </example> + ++<!-- 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, set a root password in it, start + it as a service</title> + +- <programlisting># machinectl pull-raw --verify=no \ ++ <programlisting># machinectl pull-raw -&2D;verify=no \ + 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 \ + Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 + # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 +@@ -959,6 +960,7 @@ + the machine started as system service. With the last command a + login prompt into the container is requested.</para> + </example> ++--> + + <example> + <title>Exports a container image as tar file</title> -- 2.18.0 |