summaryrefslogtreecommitdiff
path: root/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
diff options
context:
space:
mode:
authorfauno <fauno@endefensadelsl.org>2018-01-06 19:31:57 -0300
committerfauno <fauno@endefensadelsl.org>2018-01-06 19:31:57 -0300
commit685d3ca91babdbb7e4efed88a75fe776a593b725 (patch)
tree0f1add3030cce7d571023522cbf9b78a11c3fc74 /libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
parentb3fae2f65c48f17b2c5b534b768ca0607b9e800d (diff)
parent8161eec2a2b550802274afaf9b162195053814f2 (diff)
downloadabslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.tar.gz
abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.tar.bz2
abslibre-685d3ca91babdbb7e4efed88a75fe776a593b725.zip
Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre
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.patch83
1 files changed, 57 insertions, 26 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 145e45d4b..d2bbda12c 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,18 +1,18 @@
-From 888c40a593c053c4af053fbe6ecd31c8c51f70c8 Mon Sep 17 00:00:00 2001
+From 6998da16c87712adea3e5b49a04aec180178d11a 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/7] FSDG: man/: Use FSDG operating systems as examples
---
man/os-release.xml | 49 +++++++++++++++++++++++++------------------------
- man/systemd-nspawn.xml | 34 ++++++++++++++++++----------------
- 2 files changed, 43 insertions(+), 40 deletions(-)
+ man/systemd-nspawn.xml | 48 ++++++++++++++++++++++++++----------------------
+ 2 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/man/os-release.xml b/man/os-release.xml
-index caf60f41a..2811f434c 100644
+index 81f294c7e4..973e19747d 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
without a version component, and suitable for presentation to
the user. If not set, defaults to
<literal>NAME=GNU/Linux</literal>. Example:
@@ -21,7 +21,7 @@ index caf60f41a..2811f434c 100644
GNU/Linux"</literal>.</para></listitem>
</varlistentry>
-@@ -133,8 +133,8 @@
+@@ -135,8 +135,8 @@
version, excluding any OS name information, possibly including
a release code name, and suitable for presentation to the
user. This field is optional. Example:
@@ -32,7 +32,7 @@ index caf60f41a..2811f434c 100644
</varlistentry>
<varlistentry>
-@@ -146,8 +146,8 @@
+@@ -148,8 +148,8 @@
suitable for processing by scripts or usage in generated
filenames. If not set, defaults to
<literal>ID=gnu-linux</literal>. Example:
@@ -43,7 +43,7 @@ index caf60f41a..2811f434c 100644
</varlistentry>
<varlistentry>
-@@ -168,9 +168,9 @@
+@@ -170,9 +170,9 @@
should be listed in order of how closely the local operating
system relates to the listed ones, starting with the closest.
This field is optional. Example: for an operating system with
@@ -55,7 +55,7 @@ index caf60f41a..2811f434c 100644
assignment of <literal>ID_LIKE=debian</literal> is
appropriate.</para></listitem>
</varlistentry>
-@@ -199,8 +199,8 @@
+@@ -201,8 +201,8 @@
identifying the operating system version, excluding any OS
name information or release code name, and suitable for
processing by scripts or usage in generated filenames. This
@@ -66,7 +66,7 @@ index caf60f41a..2811f434c 100644
</varlistentry>
<varlistentry>
-@@ -211,8 +211,8 @@
+@@ -213,8 +213,8 @@
a release code name or OS version of some kind, as suitable.
If not set, defaults to
<literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
@@ -77,7 +77,7 @@ index caf60f41a..2811f434c 100644
</varlistentry>
<varlistentry>
-@@ -235,7 +235,7 @@
+@@ -237,7 +237,7 @@
<ulink url="http://scap.nist.gov/specifications/cpe/">Common
Platform Enumeration Specification</ulink> as proposed by the
NIST. This field is optional. Example:
@@ -86,7 +86,7 @@ index caf60f41a..2811f434c 100644
</para></listitem>
</varlistentry>
-@@ -270,8 +270,8 @@
+@@ -272,8 +272,8 @@
one URL shall be listed in each setting. If multiple resources
need to be referenced, it is recommended to provide an online
landing page linking all available resources. Examples:
@@ -97,7 +97,7 @@ index caf60f41a..2811f434c 100644
</varlistentry>
<varlistentry>
-@@ -346,21 +346,22 @@
+@@ -348,21 +348,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:
@@ -131,23 +131,24 @@ index caf60f41a..2811f434c 100644
<refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index ae7082776..ef80d90ba 100644
+index 3dbdf376d3..01e6ca403a 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
-@@ -1048,10 +1048,11 @@
+@@ -1082,11 +1082,12 @@
<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>Download a
+ <ulink url="https://getfedora.org">Fedora</ulink> 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 @@
+@@ -1094,31 +1095,32 @@
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
and opens a shell in it.</para>
</example>
@@ -157,18 +158,24 @@ index ae7082776..ef80d90ba 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=25 --installroot=/srv/mycontainer \
+- <programlisting># dnf -y --releasever=27 --installroot=/var/lib/machines/f27container \
- --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \
- systemd passwd dnf fedora-release vim-minimal
-+ <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer \
+-# systemd-nspawn -bD /var/lib/machines/f27container</programlisting>
++ <programlisting># dnf -y --releasever=140k --installroot=/var/lib/machines/blag140container \
+ --disablerepo='*' --enablerepo=blag --enablerepo=updates install \
+ systemd passwd dnf blag-release vim-minimal
- # systemd-nspawn -bD /srv/mycontainer</programlisting>
++# systemd-nspawn -bD /var/lib/machines/blag140container</programlisting>
- <para>This installs a minimal Fedora distribution into the
+- directory <filename noindex='true'>/var/lib/machines/f27container</filename>
+ <para>This installs a minimal BLAG distribution into the
- directory <filename noindex='true'>/srv/mycontainer/</filename>
- and then boots an OS in a namespace container in it.</para>
++ directory <filename noindex='true'>/var/lib/machines/blag140container</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>
</example>
<example>
@@ -185,11 +192,14 @@ index ae7082776..ef80d90ba 100644
+ <para>This installs a minimal gNewSense unstable distribution into
+ the directory <filename>~/gnewsense-tree/</filename> and then
spawns a shell in a namespace container in it.</para>
- </example>
+
+ <para><command>debootstrap</command> supports
+@@ -1133,29 +1135,31 @@
<example>
-- <title>Boot a minimal Arch Linux distribution in a container</title>
-+ <title>Boot a minimal Parabola distribution in a container</title>
+ <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
-# systemd-nspawn -bD ~/arch-tree/</programlisting>
@@ -203,6 +213,27 @@ index ae7082776..ef80d90ba 100644
in a namespace container in it.</para>
</example>
++<!-- TODO: This example needs switched to an FSDG OS
+ <example>
+ <title>Install the
+ <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>
+ rolling distribution</title>
+
+- <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \
++ <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \
+ https://download.opensuse.org/tumbleweed/repo/oss tumbleweed
+-# zypper --root=/var/lib/machines/tumbleweed refresh
+-# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \
++# zypper -&2Droot=/var/lib/machines/tumbleweed refresh
++# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \
+ systemd shadow zypper openSUSE-release vim
+ # systemd-nspawn -M tumbleweed passwd root
+ # systemd-nspawn -M tumbleweed -b</programlisting>
+ </example>
++-->
+
+ <example>
+ <title>Boot into an ephemeral snapshot of the host system</title>
--
-2.13.2
+2.15.1