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 | 57 |
1 files changed, 35 insertions, 22 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 73a01d674..c1b06119f 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 @@ -97,26 +97,29 @@ index 272258b4e1..6cea40cb99 100644 </varlistentry> <varlistentry> -@@ -323,21 +323,22 @@ - recommended to prefix new fields with an OS specific - name in order to avoid name clashes. Applications - reading this file must ignore unknown fields. Example: -- <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para> -+ <literal>DEBIAN_BTS="debbugs://bugs.gnewsense.org/"</literal></para> - </refsect1> - +@@ -350,25 +350,19 @@ <refsect1> <title>Example</title> - <programlisting>NAME=Fedora --VERSION="17 (Beefy Miracle)" +-VERSION="32 (Workstation Edition)" -ID=fedora --VERSION_ID=17 --PRETTY_NAME="Fedora 17 (Beefy Miracle)" --ANSI_COLOR="0;34" --CPE_NAME="cpe:/o:fedoraproject:fedora:17" +-VERSION_ID=32 +-PRETTY_NAME="Fedora 32 (Workstation Edition)" +-ANSI_COLOR="0;38;2;60;110;180" +-LOGO=fedora-logo-icon +-CPE_NAME="cpe:/o:fedoraproject:fedora:32" -HOME_URL="https://fedoraproject.org/" --BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting> +-DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f32/system-administrators-guide/" +-SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" +-BUG_REPORT_URL="https://bugzilla.redhat.com/" +-REDHAT_BUGZILLA_PRODUCT="Fedora" +-REDHAT_BUGZILLA_PRODUCT_VERSION=32 +-REDHAT_SUPPORT_PRODUCT="Fedora" +-REDHAT_SUPPORT_PRODUCT_VERSION=32 +-PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" +-VARIANT="Workstation Edition" +-VARIANT_ID=workstation</programlisting> + <programlisting>NAME=Parabola +VERSION="rolling-release" +ID=parabola @@ -124,26 +127,29 @@ index 272258b4e1..6cea40cb99 100644 +VERSION_ID=rolling-release +PRETTY_NAME="Parabola GNU/Linux-libre" +ANSI_COLOR="1;35" ++LOGO=parabola-logo-icon +CPE_NAME="cpe:/o:parabola:parabola:rolling-release" +HOME_URL="https://www.parabola.nu/" ++DOCUMENTATION_URL="https://wiki.parabola.nu/" ++SUPPORT_URL="https://labs.parabola.nu/projects/parabola-community-forum/boards" +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting> </refsect1> <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index b269b99170..19a44bb09a 100644 +index 69558ac85c..a561fe9eb0 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 "31"> +-<!ENTITY fedora_latest_version "32"> +<!ENTITY blag_latest_version "140"> - <!ENTITY fedora_cloud_release "1.9"> + <!ENTITY fedora_cloud_release "1.6"> ]> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -@@ -1359,11 +1359,12 @@ +@@ -1415,11 +1415,12 @@ <refsect1> <title>Examples</title> @@ -157,7 +163,7 @@ index b269b99170..19a44bb09a 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> -@@ -1372,31 +1373,32 @@ +@@ -1428,37 +1429,36 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and opens a shell in it.</para> </example> @@ -180,7 +186,7 @@ index b269b99170..19a44bb09a 100644 - directory <filename index="false">/var/lib/machines/f&fedora_latest_version;</filename> + <para>This installs a minimal BLAG distribution into the + directory <filename index="false">/var/lib/machines/blag&blag_latest_version;</filename> - and then boots an OS in a namespace container in it. Because the installation + and then boots that OS in a namespace container. 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 f&fedora_latest_version;</command>.</para> @@ -200,10 +206,17 @@ index b269b99170..19a44bb09a 100644 - the directory <filename>~/debian-tree/</filename> and then + <para>This installs a minimal gNewSense Ucclia distribution into + the directory <filename>~/gnewsense-tree/</filename> and then - spawns a shell in a namespace container in it.</para> + spawns a shell from this image in a namespace container.</para> <para><command>debootstrap</command> supports -@@ -1411,29 +1413,31 @@ +- <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> + 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 @@ <example> <title>Boot a minimal |