diff options
Diffstat (limited to 'libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch')
| -rw-r--r-- | libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch | 121 |
1 files changed, 81 insertions, 40 deletions
diff --git a/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 0905e6bad..d14058763 100644 --- a/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre-testing/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,20 @@ 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 284c9b294b..7b3d211161 100644 +index 588924ee61..34ff6a7e96 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"> - ]> - -@@ -1176,11 +1176,12 @@ +@@ -1461,11 +1461,12 @@ <refsect1> <title>Examples</title> @@ -154,10 +151,10 @@ index 284c9b294b..7b3d211161 100644 - <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 - # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting> - -@@ -1188,31 +1189,32 @@ + 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> +@@ -1474,37 +1475,36 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and opens a shell in it.</para> </example> @@ -169,18 +166,18 @@ index 284c9b294b..7b3d211161 100644 - <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 passwd dnf fedora-release vim-minimal glibc-minimal-langpack -# 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 passwd dnf blag-release vim-minimal glibc-minimal-langpack +# 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/f&fedora_latest_version;</filename> +- directory <filename index="false">/var/lib/machines/f&fedora_latest_version;</filename> + <para>This installs a minimal BLAG distribution into the -+ 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 ++ directory <filename index="false">/var/lib/machines/blag&blag_latest_version;</filename> + 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> @@ -198,26 +195,33 @@ index 284c9b294b..7b3d211161 100644 - <para>This installs a minimal Debian unstable distribution into - the directory <filename>~/debian-tree/</filename> and then -+ <para>This installs a minimal gNewSense unstable distribution into ++ <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 -@@ -1227,29 +1229,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="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>. +@@ -1513,29 +1513,31 @@ <example> <title>Boot a minimal - <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title> + <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title> -- <programlisting># pacstrap -c -d ~/arch-tree/ base +- <programlisting># pacstrap -c ~/arch-tree/ base -# systemd-nspawn -bD ~/arch-tree/</programlisting> -+ <programlisting># pacstrap -c -d ~/parabola-tree/ base ++ <programlisting># pacstrap -c ~/parabola-tree/ base +# systemd-nspawn -bD ~/parabola-tree/</programlisting> - <para>This installs a minimal Arch Linux distribution into the - directory <filename>~/arch-tree/</filename> and then boots an OS -+ <para>This installs a minimal Parabola distribution into the ++ <para>This installs a minimal Parabola GNU/Linux-libre distribution into the + directory <filename>~/parabola-tree/</filename> and then boots an OS in a namespace container in it.</para> </example> @@ -243,6 +247,43 @@ index 284c9b294b..7b3d211161 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 |