summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 12:49:37 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-25 17:45:35 -0400
commit3d271810cb33579af657475407a5c3157375cb80 (patch)
tree129cbc975f29682735536fdec40addccec974ccf
parenta99d37e8cf3cefec2e59be2afc507559b3e94f6a (diff)
downloadabslibre-3d271810cb33579af657475407a5c3157375cb80.tar.gz
abslibre-3d271810cb33579af657475407a5c3157375cb80.tar.bz2
abslibre-3d271810cb33579af657475407a5c3157375cb80.zip
libre/systemd: Split gnu+linux.patch into multiple patches, tidy them up.
I removed several instances of replacing "Linux" with "GNU/Linux" in man pages where it was (correctly) referring to kernel, not the complete operating system. In the FSDG-distros patch, I added " (Spartakus)" to several BLAG examples, as appropriate. Also, some of the linebreaks were in bad locations with the XML. I also added a patch to systemd-resolved to have the default hostname be "gnu-linux[.local]" instead of "linux[.local]".
-rw-r--r--libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch80
-rw-r--r--libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch96
-rw-r--r--libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch40
-rw-r--r--libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch28
-rw-r--r--libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch33
-rw-r--r--libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch199
-rw-r--r--libre/systemd/PKGBUILD24
-rw-r--r--libre/systemd/gnu+linux.patch493
8 files changed, 493 insertions, 500 deletions
diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
new file mode 100644
index 000000000..e91d0afd8
--- /dev/null
+++ b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
@@ -0,0 +1,80 @@
+From 64713f35b5a75b441ab300813ff5a48b0bffed92 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Wed, 25 May 2016 12:19:20 -0400
+Subject: [PATCH 1/6] FSDG: man/: Refer to the operating system as GNU/Linux.
+
+This is not a blind replacement of "Linux" with "GNU/Linux". In some
+cases, "Linux" is (correctly) used to refer to just the kernel. In others,
+it is in a string for which code must also be adjusted; these instances
+are not included in this commit.
+---
+ man/daemon.xml | 4 ++--
+ man/sd-bus-errors.xml | 2 +-
+ man/sd_bus_error_add_map.xml | 2 +-
+ man/systemd.xml | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/man/daemon.xml b/man/daemon.xml
+index b6125cb..f74fd35 100644
+--- a/man/daemon.xml
++++ b/man/daemon.xml
+@@ -168,7 +168,7 @@
+ <refsect2>
+ <title>New-Style Daemons</title>
+
+- <para>Modern services for Linux should be implemented as
++ <para>Modern services for GNU/Linux should be implemented as
+ new-style daemons. This makes it easier to supervise and control
+ them at runtime and simplifies their implementation.</para>
+
+@@ -311,7 +311,7 @@
+ as detailed in the <ulink
+ url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
+ Linux Standard Base Core Specification</ulink>. This method of
+- activation is supported ubiquitously on Linux init systems, both
++ activation is supported ubiquitously on GNU/Linux init systems, both
+ old-style and new-style systems. Among other issues, SysV init
+ scripts have the disadvantage of involving shell scripts in the
+ boot process. New-style init systems generally employ updated
+diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
+index 055af7a..d2b81f4 100644
+--- a/man/sd-bus-errors.xml
++++ b/man/sd-bus-errors.xml
+@@ -126,7 +126,7 @@
+
+ <para>In addition to this list, in sd-bus, the special error
+ namespace <literal>System.Error.</literal> is used to map
+- arbitrary Linux system errors (as defined by <citerefentry
++ arbitrary GNU/Linux system errors (as defined by <citerefentry
+ project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
+ to D-Bus errors and back. For example, the error
+ <constant>EUCLEAN</constant> is mapped to
+diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
+index 139bd77..7dc1ef6 100644
+--- a/man/sd_bus_error_add_map.xml
++++ b/man/sd_bus_error_add_map.xml
+@@ -82,7 +82,7 @@
+
+ <para>The <function>sd_bus_error_add_map()</function> call may be
+ used to register additional mappings for converting D-Bus errors
+- to Linux <varname>errno</varname>-style errors. The mappings
++ to GNU/Linux <varname>errno</varname>-style errors. The mappings
+ defined with this call are consulted by calls such as
+ <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+ or
+diff --git a/man/systemd.xml b/man/systemd.xml
+index b8d91b8..e05a9d6 100644
+--- a/man/systemd.xml
++++ b/man/systemd.xml
+@@ -61,7 +61,7 @@
+ <refsect1>
+ <title>Description</title>
+
+- <para>systemd is a system and service manager for Linux operating
++ <para>systemd is a system and service manager for GNU/Linux operating
+ systems. When run as first process on boot (as PID 1), it acts as
+ init system that brings up and maintains userspace
+ services.</para>
+--
+2.8.3
+
diff --git a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
new file mode 100644
index 000000000..c247cb3ad
--- /dev/null
+++ b/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
@@ -0,0 +1,96 @@
+From d6a67e5ff7d99af484a9ebf68d3fe2510bffd099 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Wed, 25 May 2016 12:23:40 -0400
+Subject: [PATCH 2/6] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux"
+ instead of "Linux".
+
+---
+ man/kernel-install.xml | 2 +-
+ man/os-release.xml | 2 +-
+ src/analyze/analyze.c | 2 +-
+ src/core/main.c | 2 +-
+ src/firstboot/firstboot.c | 2 +-
+ src/kernel-install/90-loaderentry.install | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/man/kernel-install.xml b/man/kernel-install.xml
+index d7e27de..eb51918 100644
+--- a/man/kernel-install.xml
++++ b/man/kernel-install.xml
+@@ -106,7 +106,7 @@
+ <replaceable>PRETTY_NAME</replaceable> parameter specified
+ in <filename>/etc/os-release</filename> or
+ <filename>/usr/lib/os-release</filename> (if the former is
+- missing), or "Linux
++ missing), or "GNU/Linux
+ <replaceable>KERNEL-VERSION</replaceable>", if unset. If
+ the file <filename>initrd</filename> is found next to the
+ <filename>linux</filename> file, the initrd will be added to
+diff --git a/man/os-release.xml b/man/os-release.xml
+index 4557abc..767a1c7 100644
+--- a/man/os-release.xml
++++ b/man/os-release.xml
+@@ -194,7 +194,7 @@
+ suitable for presentation to the user. May or may not contain
+ a release code name or OS version of some kind, as suitable.
+ If not set, defaults to
+- <literal>PRETTY_NAME="Linux"</literal>. Example:
++ <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
+ <literal>PRETTY_NAME="Fedora 17 (Beefy
+ Miracle)"</literal>.</para></listitem>
+ </varlistentry>
+diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
+index a847084..1a28093 100644
+--- a/src/analyze/analyze.c
++++ b/src/analyze/analyze.c
+@@ -660,7 +660,7 @@ static int analyze_plot(sd_bus *bus) {
+ svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
+ svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
+ svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
+- isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
++ isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,
+ strempty(host->hostname),
+ strempty(host->kernel_name),
+ strempty(host->kernel_release),
+diff --git a/src/core/main.c b/src/core/main.c
+index e208857..5346392 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -1233,7 +1233,7 @@ static int status_welcome(void) {
+ return status_printf(NULL, false, false,
+ "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
+ isempty(ansi_color) ? "1" : ansi_color,
+- isempty(pretty_name) ? "Linux" : pretty_name);
++ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
+ }
+
+ static int write_container_id(void) {
+diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
+index 7790ab8..8e57a24 100644
+--- a/src/firstboot/firstboot.c
++++ b/src/firstboot/firstboot.c
+@@ -96,7 +96,7 @@ static void print_welcome(void) {
+ log_warning_errno(r, "Failed to read os-release file: %m");
+
+ printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
+- isempty(pretty_name) ? "Linux" : pretty_name);
++ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
+
+ press_any_key();
+
+diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
+index 4c9b1f0..6e94e12 100644
+--- a/src/kernel-install/90-loaderentry.install
++++ b/src/kernel-install/90-loaderentry.install
+@@ -37,7 +37,7 @@ elif [[ -f /usr/lib/os-release ]]; then
+ fi
+
+ if ! [[ $PRETTY_NAME ]]; then
+- PRETTY_NAME="Linux $KERNEL_VERSION"
++ PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
+ fi
+
+ declare -a BOOT_OPTIONS
+--
+2.8.3
+
diff --git a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch
new file mode 100644
index 000000000..d6c40587d
--- /dev/null
+++ b/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch
@@ -0,0 +1,40 @@
+From 20c90fb1a90a1702ce5e7d79dd16ee160640a1ee Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Wed, 25 May 2016 12:24:56 -0400
+Subject: [PATCH 3/6] FSDG: os-release: Default to NAME "GNU/Linux" instead of
+ "Linux".
+
+---
+ man/os-release.xml | 2 +-
+ src/journal-remote/journal-gatewayd.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/os-release.xml b/man/os-release.xml
+index 767a1c7..f6787f9 100644
+--- a/man/os-release.xml
++++ b/man/os-release.xml
+@@ -121,7 +121,7 @@
+ <listitem><para>A string identifying the operating system,
+ without a version component, and suitable for presentation to
+ the user. If not set, defaults to
+- <literal>NAME=Linux</literal>. Example:
++ <literal>NAME=GNU/Linux</literal>. Example:
+ <literal>NAME=Fedora</literal> or <literal>NAME="Debian
+ GNU/Linux"</literal>.</para></listitem>
+ </varlistentry>
+diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
+index 60d8977..3b9adb5 100644
+--- a/src/journal-remote/journal-gatewayd.c
++++ b/src/journal-remote/journal-gatewayd.c
+@@ -799,7 +799,7 @@ static int request_handler_machine(
+ SD_ID128_FORMAT_VAL(mid),
+ SD_ID128_FORMAT_VAL(bid),
+ hostname_cleanup(hostname),
+- os_name ? os_name : "Linux",
++ os_name ? os_name : "GNU/Linux",
+ v ? v : "bare",
+ usage,
+ cutoff_from,
+--
+2.8.3
+
diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
new file mode 100644
index 000000000..8a130ab78
--- /dev/null
+++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
@@ -0,0 +1,28 @@
+From 6f4e352372876053efb168e6dc9e74a57c8d6c2e Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Wed, 25 May 2016 12:28:30 -0400
+Subject: [PATCH 4/6] FSDG: os-release: Default ID to "gnu-linux" instead of
+ "linux".
+
+As far as I can tell, no code in this repository actually uses the ID
+field, so this is just a man page change.
+---
+ man/os-release.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/os-release.xml b/man/os-release.xml
+index f6787f9..79eb402 100644
+--- a/man/os-release.xml
++++ b/man/os-release.xml
+@@ -145,7 +145,7 @@
+ the operating system, excluding any version information and
+ suitable for processing by scripts or usage in generated
+ filenames. If not set, defaults to
+- <literal>ID=linux</literal>. Example:
++ <literal>ID=gnu-linux</literal>. Example:
+ <literal>ID=fedora</literal> or
+ <literal>ID=debian</literal>.</para></listitem>
+ </varlistentry>
+--
+2.8.3
+
diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch b/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch
new file mode 100644
index 000000000..f5e9de8fc
--- /dev/null
+++ b/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch
@@ -0,0 +1,33 @@
+From 71b8c10050db1a16402e0600c9921b012c908b44 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Wed, 25 May 2016 12:31:20 -0400
+Subject: [PATCH 5/6] FSDG: systemd-resolved: Default to hostname "gnu-linux"
+ instead of "linux"
+
+---
+ src/resolve/resolved-manager.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
+index 7f90734..e82c6ec 100644
+--- a/src/resolve/resolved-manager.c
++++ b/src/resolve/resolved-manager.c
+@@ -429,12 +429,12 @@ static int manager_watch_hostname(Manager *m) {
+
+ r = determine_hostname(&m->llmnr_hostname, &m->mdns_hostname);
+ if (r < 0) {
+- log_info("Defaulting to hostname 'linux'.");
+- m->llmnr_hostname = strdup("linux");
++ log_info("Defaulting to hostname 'gnu-linux'.");
++ m->llmnr_hostname = strdup("gnu-linux");
+ if (!m->llmnr_hostname)
+ return log_oom();
+
+- m->mdns_hostname = strdup("linux.local");
++ m->mdns_hostname = strdup("gnu-linux.local");
+ if (!m->mdns_hostname)
+ return log_oom();
+ } else
+--
+2.8.3
+
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
new file mode 100644
index 000000000..82d60ec94
--- /dev/null
+++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
@@ -0,0 +1,199 @@
+From 566cac15ed36506e2bb766313a5d4e0825bc6499 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Wed, 25 May 2016 12:32:21 -0400
+Subject: [PATCH 6/6] 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(-)
+
+diff --git a/man/os-release.xml b/man/os-release.xml
+index 79eb402..a70ba1a 100644
+--- a/man/os-release.xml
++++ b/man/os-release.xml
+@@ -122,7 +122,7 @@
+ without a version component, and suitable for presentation to
+ the user. If not set, defaults to
+ <literal>NAME=GNU/Linux</literal>. Example:
+- <literal>NAME=Fedora</literal> or <literal>NAME="Debian
++ <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense
+ GNU/Linux"</literal>.</para></listitem>
+ </varlistentry>
+
+@@ -133,8 +133,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:
+- <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy
+- Miracle)"</literal>.</para></listitem>
++ <literal>VERSION=210k</literal> or <literal>VERSION="210k
++ (Spartakus)"</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+@@ -146,8 +146,8 @@
+ suitable for processing by scripts or usage in generated
+ filenames. If not set, defaults to
+ <literal>ID=gnu-linux</literal>. Example:
+- <literal>ID=fedora</literal> or
+- <literal>ID=debian</literal>.</para></listitem>
++ <literal>ID=blag</literal> or
++ <literal>ID=gnewsense</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+@@ -168,9 +168,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
+- <literal>ID=centos</literal>, an assignment of
++ <literal>ID=blag</literal>, an assignment of
+ <literal>ID_LIKE="rhel fedora"</literal> would be appropriate.
+- For an operating system with <literal>ID=ubuntu</literal>, an
++ For an operating system with <literal>ID=gnewsense</literal>, an
+ assignment of <literal>ID_LIKE=debian</literal> is
+ appropriate.</para></listitem>
+ </varlistentry>
+@@ -183,8 +183,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
+- field is optional. Example: <literal>VERSION_ID=17</literal>
+- or <literal>VERSION_ID=11.04</literal>.</para></listitem>
++ field is optional. Example: <literal>VERSION_ID=210k</literal>
++ or <literal>VERSION_ID=7.0</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+@@ -195,8 +195,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:
+- <literal>PRETTY_NAME="Fedora 17 (Beefy
+- Miracle)"</literal>.</para></listitem>
++ <literal>PRETTY_NAME="BLAG 210k
++ (Spartakus)"</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+@@ -219,7 +219,7 @@
+ <ulink url="http://scap.nist.gov/specifications/cpe/">Common
+ Platform Enumeration Specification</ulink> as proposed by the
+ NIST. This field is optional. Example:
+- <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
++ <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal>
+ </para></listitem>
+ </varlistentry>
+
+@@ -254,8 +254,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:
+- <literal>HOME_URL="https://fedoraproject.org/"</literal> and
+- <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem>
++ <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and
++ <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+@@ -330,21 +330,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>
+
+ <refsect1>
+ <title>Example</title>
+
+- <programlisting>NAME=Fedora
+-VERSION="17 (Beefy Miracle)"
+-ID=fedora
+-VERSION_ID=17
+-PRETTY_NAME="Fedora 17 (Beefy Miracle)"
+-ANSI_COLOR="0;34"
+-CPE_NAME="cpe:/o:fedoraproject:fedora:17"
+-HOME_URL="https://fedoraproject.org/"
+-BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>
++ <programlisting>NAME=Parabola
++VERSION="rolling-release"
++ID=parabola
++ID_LIKE=arch
++VERSION_ID=rolling-release
++PRETTY_NAME="Parabola GNU/Linux-libre"
++ANSI_COLOR="1;35"
++CPE_NAME="cpe:/o:parabola:parabola:rolling-release"
++HOME_URL="https://www.parabola.nu/"
++BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>
+ </refsect1>
+
+ <refsect1>
+diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
+index 86cdb4e..bd7392c 100644
+--- a/man/systemd-nspawn.xml
++++ b/man/systemd-nspawn.xml
+@@ -912,46 +912,35 @@
+ <title>Examples</title>
+
+ <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>
+
+- <programlisting># machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz
+-# systemd-nspawn -M Fedora-Cloud-Base-20141203-21</programlisting>
+-
+- <para>This downloads an image using
+- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+- and opens a shell in it.</para>
+- </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
+ # systemd-nspawn -bD /srv/mycontainer</programlisting>
+
+- <para>This installs a minimal Fedora distribution into the
++ <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>
+ </example>
+
+ <example>
+- <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>
++ <title>Spawn a shell in a container of a minimal gNewSense unstable distribution</title>
+
+- <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/
+-# systemd-nspawn -D ~/debian-tree/</programlisting>
++ <programlisting># debootstrap --arch=amd64 unstable ~/gnewsense-tree/
++# systemd-nspawn -D ~/gnewsense-tree/</programlisting>
+
+- <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
++ the directory <filename>~/gnewsense-tree/</filename> and then
+ spawns a shell in a namespace container in it.</para>
+ </example>
+
+ <example>
+- <title>Boot a minimal Arch Linux distribution in a container</title>
++ <title>Boot a minimal Parabola GNU/Linux-libre distribution in a container</title>
+
+- <programlisting># pacstrap -c -d ~/arch-tree/ base
+-# systemd-nspawn -bD ~/arch-tree/</programlisting>
++ <programlisting># pacstrap -c -d ~/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 GNU/Linux-libre distribution into the
++ directory <filename>~/parabola-tree/</filename> and then boots an OS
+ in a namespace container in it.</para>
+ </example>
+
+--
+2.8.3
+
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index d474ad448..7a8dcd070 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -21,7 +21,12 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
'initcpio-install-udev'
'parabola.conf'
'loader.conf'
- 'gnu+linux.patch')
+ '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
+ '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch'
+ '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch'
+ '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
+ '0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch'
+ '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch')
md5sums=('SKIP'
'f8253cd3c0f249591338fbb4c223d249'
'SKIP'
@@ -30,7 +35,12 @@ md5sums=('SKIP'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'36ee74767ac8734dede1cbd0f4f275d7'
'9b9f4a58e4c4009bf5290c5b297600c3'
- 'd37895215ef74e172c594aebe1ba23cb')
+ '92a4bb5e527e1e956743c1ffa622adc7'
+ '35e9e89add0243f77f0b1c9be6f7bdcb'
+ 'e592f6778c12627d46982ddfe0698361'
+ 'c4c559f9916806f5162ccff3e7c433e8'
+ '5166fe700ef5991c2da3876206c699fb'
+ '166ce41b60d4eaa7738486f7aab5ebd8')
validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva
prepare() {
@@ -48,11 +58,11 @@ prepare() {
# revert "core: resolve specifier in config_parse_exec()"
git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163
- # Rename "Linux" -> "GNU/Linux"
- patch -Np1 -i "$srcdir/gnu+linux.patch"
- sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c
- sed -i '\|pretty_name| s|Linux|GNU/Linux|' src/analyze/analyze.c src/core/main.c src/firstboot/firstboot.c
- sed -i '\|PRETTY_NAME| s|Linux|GNU/Linux|' src/kernel-install/90-loaderentry.install
+ # apply FSDG patches
+ local patchfile
+ for patchfile in "$srcdir"/*.patch; do
+ patch -Np1 -i "$patchfile"
+ done
# Rename "Linux Boot Manager" -> "Systemd Boot Manager"
sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c
diff --git a/libre/systemd/gnu+linux.patch b/libre/systemd/gnu+linux.patch
deleted file mode 100644
index f6a5e81d5..000000000
--- a/libre/systemd/gnu+linux.patch
+++ /dev/null
@@ -1,493 +0,0 @@
-diff -Nur a/man/bootup.xml b/man/bootup.xml
---- a/man/bootup.xml 2015-09-11 14:55:47.363340869 -0300
-+++ b/man/bootup.xml 2015-09-11 14:57:22.649010069 -0300
-@@ -54,7 +54,7 @@
- boot. Immediately after power-up, the system BIOS will do minimal
- hardware initialization, and hand control over to a boot loader
- stored on a persistent storage device. This boot loader will then
-- invoke an OS kernel from disk (or the network). In the Linux case,
-+ invoke an OS kernel from disk (or the network). In the GNU/Linux case,
- this kernel (optionally) extracts and executes an initial RAM disk
- image (initrd), such as generated by
- <citerefentry project='die-net'><refentrytitle>dracut</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-diff -Nur a/man/custom-html.xsl b/man/custom-html.xsl
---- a/man/custom-html.xsl 2015-11-28 05:22:36.372154698 -0300
-+++ b/man/custom-html.xsl 2015-11-28 05:23:08.917203964 -0300
-@@ -83,10 +83,10 @@
- </a>
- </xsl:template>
-
--<xsl:template match="citerefentry[@project='archlinux']">
-+<xsl:template match="citerefentry[@project='parabola']">
- <a>
- <xsl:attribute name="href">
-- <xsl:text>https://www.archlinux.org/</xsl:text>
-+ <xsl:text>https://www.parabola.nu/</xsl:text>
- <xsl:value-of select="refentrytitle"/>
- <xsl:text>/</xsl:text>
- <xsl:value-of select="refentrytitle"/>
-@@ -96,19 +96,6 @@
- </xsl:attribute>
- <xsl:call-template name="inline.charseq"/>
- </a>
--</xsl:template>
--
--<xsl:template match="citerefentry[@project='freebsd']">
-- <a>
-- <xsl:attribute name="href">
-- <xsl:text>https://www.freebsd.org/cgi/man.cgi?</xsl:text>
-- <xsl:value-of select="refentrytitle"/>
-- <xsl:text>(</xsl:text>
-- <xsl:value-of select="manvolnum"/>
-- <xsl:text>)</xsl:text>
-- </xsl:attribute>
-- <xsl:call-template name="inline.charseq"/>
-- </a>
- </xsl:template>
-
- <xsl:template match="citerefentry[@project='dbus']">
-diff -Nur a/man/daemon.xml b/man/daemon.xml
---- a/man/daemon.xml 2015-11-28 05:22:36.372154698 -0300
-+++ b/man/daemon.xml 2015-11-28 05:26:43.416694259 -0300
-@@ -74,7 +74,7 @@
- <listitem><para>Close all open file descriptors except
- standard input, output, and error (i.e. the first three file
- descriptors 0, 1, 2). This ensures that no accidentally passed
-- file descriptor stays around in the daemon process. On Linux,
-+ file descriptor stays around in the daemon process. On GNU/Linux,
- this is best implemented by iterating through
- <filename>/proc/self/fd</filename>, with a fallback of
- iterating from file descriptor 3 to the value returned by
-@@ -168,7 +168,7 @@
- <refsect2>
- <title>New-Style Daemons</title>
-
-- <para>Modern services for Linux should be implemented as
-+ <para>Modern services for GNU/Linux should be implemented as
- new-style daemons. This makes it easier to supervise and control
- them at runtime and simplifies their implementation.</para>
-
-@@ -311,7 +311,7 @@
- as detailed in the <ulink
- url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
- Linux Standard Base Core Specification</ulink>. This method of
-- activation is supported ubiquitously on Linux init systems, both
-+ activation is supported ubiquitously on GNU/Linux init systems, both
- old-style and new-style systems. Among other issues, SysV init
- scripts have the disadvantage of involving shell scripts in the
- boot process. New-style init systems generally employ updated
-@@ -479,7 +479,7 @@
- start daemons or <filename>.socket</filename> units when a
- specific IP address is configured on a network interface,
- because network sockets shall be bound to the address. However,
-- an alternative to implement this is by utilizing the Linux
-+ an alternative to implement this is by utilizing the GNU/Linux
- <constant>IP_FREEBIND</constant> socket option, as accessible
- via <varname>FreeBind=yes</varname> in systemd socket files (see
- <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-@@ -491,7 +491,7 @@
- for service activation is low system load. However, here too, a
- more convincing approach might be to make proper use of features
- of the operating system, in particular, the CPU or I/O scheduler
-- of Linux. Instead of scheduling jobs from userspace based on
-+ of GNU/Linux. Instead of scheduling jobs from userspace based on
- monitoring the OS scheduler, it is advisable to leave the
- scheduling of processes to the OS scheduler itself. systemd
- provides fine-grained access to the CPU and I/O schedulers. If a
-diff -Nur a/man/kernel-install.xml b/man/kernel-install.xml
---- a/man/kernel-install.xml 2015-09-11 14:55:47.366340890 -0300
-+++ b/man/kernel-install.xml 2015-09-11 15:04:24.500215627 -0300
-@@ -106,7 +106,7 @@
- <replaceable>PRETTY_NAME</replaceable> parameter specified
- in <filename>/etc/os-release</filename> or
- <filename>/usr/lib/os-release</filename> (if the former is
-- missing), or "Linux
-+ missing), or "GNU/Linux
- <replaceable>KERNEL-VERSION</replaceable>", if unset. If
- the file <filename>initrd</filename> is found next to the
- <filename>linux</filename> file, the initrd will be added to
-diff -Nur a/man/os-release.xml b/man/os-release.xml
---- a/man/os-release.xml 2015-09-20 20:12:13.796706013 -0300
-+++ b/man/os-release.xml 2015-09-20 20:14:32.399758269 -0300
-@@ -121,8 +121,8 @@
- <listitem><para>A string identifying the operating system,
- without a version component, and suitable for presentation to
- the user. If not set, defaults to
-- <literal>NAME=Linux</literal>. Example:
-- <literal>NAME=Fedora</literal> or <literal>NAME="Debian
-+ <literal>NAME=GNU/Linux</literal>. Example:
-+ <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense
- GNU/Linux"</literal>.</para></listitem>
- </varlistentry>
-
-@@ -133,8 +133,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:
-- <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy
-- Miracle)"</literal>.</para></listitem>
-+ <literal>VERSION=210k</literal> or <literal>VERSION="210k"
-+ </literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -145,9 +145,9 @@
- the operating system, excluding any version information and
- suitable for processing by scripts or usage in generated
- filenames. If not set, defaults to
-- <literal>ID=linux</literal>. Example:
-- <literal>ID=fedora</literal> or
-- <literal>ID=debian</literal>.</para></listitem>
-+ <literal>ID=gnu-plus-linux</literal>. Example:
-+ <literal>ID=blag</literal> or
-+ <literal>ID=gnewsense</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -168,9 +168,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
-- <literal>ID=centos</literal>, an assignment of
-+ <literal>ID=blag</literal>, an assignment of
- <literal>ID_LIKE="rhel fedora"</literal> would be appropriate.
-- For an operating system with <literal>ID=ubuntu</literal>, an
-+ For an operating system with <literal>ID=gnewsense</literal>, an
- assignment of <literal>ID_LIKE=debian</literal> is
- appropriate.</para></listitem>
- </varlistentry>
-@@ -183,8 +183,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
-- field is optional. Example: <literal>VERSION_ID=17</literal>
-- or <literal>VERSION_ID=11.04</literal>.</para></listitem>
-+ field is optional. Example: <literal>VERSION_ID=210k</literal>
-+ or <literal>VERSION_ID=7.0</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -194,9 +194,8 @@
- suitable for presentation to the user. May or may not contain
- a release code name or OS version of some kind, as suitable.
- If not set, defaults to
-- <literal>PRETTY_NAME="Linux"</literal>. Example:
-- <literal>PRETTY_NAME="Fedora 17 (Beefy
-- Miracle)"</literal>.</para></listitem>
-+ <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
-+ <literal>PRETTY_NAME="BLAG 210k"</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -219,7 +218,7 @@
- <ulink url="http://scap.nist.gov/specifications/cpe/">Common
- Platform Enumeration Specification</ulink> as proposed by the
- NIST. This field is optional. Example:
-- <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
-+ <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal>
- </para></listitem>
- </varlistentry>
-
-@@ -254,8 +253,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:
-- <literal>HOME_URL="https://fedoraproject.org/"</literal> and
-- <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem>
-+ <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and
-+ <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -330,21 +329,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>
-
- <refsect1>
- <title>Example</title>
-
-- <programlisting>NAME=Fedora
--VERSION="17 (Beefy Miracle)"
--ID=fedora
--VERSION_ID=17
--PRETTY_NAME="Fedora 17 (Beefy Miracle)"
--ANSI_COLOR="0;34"
--CPE_NAME="cpe:/o:fedoraproject:fedora:17"
--HOME_URL="https://fedoraproject.org/"
--BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>
-+ <programlisting>NAME=Parabola
-+VERSION="rolling-release"
-+ID=parabola
-+ID_LIKE=arch
-+VERSION_ID=rolling-release
-+PRETTY_NAME="Parabola GNU/Linux-libre"
-+ANSI_COLOR="1;35"
-+CPE_NAME="cpe:/o:parabola:parabola:rolling-release"
-+HOME_URL="https://www.parabola.nu/"
-+BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>
- </refsect1>
-
- <refsect1>
-diff -Nur a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
---- a/man/sd-bus-errors.xml 2015-11-28 05:22:36.375487866 -0300
-+++ b/man/sd-bus-errors.xml 2015-11-28 05:23:08.920537132 -0300
-@@ -126,7 +126,7 @@
-
- <para>In addition to this list, in sd-bus, the special error
- namespace <literal>System.Error.</literal> is used to map
-- arbitrary Linux system errors (as defined by <citerefentry
-+ arbitrary GNU/Linux system errors (as defined by <citerefentry
- project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
- to D-Bus errors and back. For example, the error
- <constant>EUCLEAN</constant> is mapped to
-diff -Nur a/man/sd-login.xml b/man/sd-login.xml
---- a/man/sd-login.xml 2015-09-11 14:55:47.368340904 -0300
-+++ b/man/sd-login.xml 2015-09-11 15:33:41.770605951 -0300
-@@ -68,8 +68,8 @@
-
- <para>See <ulink
- url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat
-- on Linux</ulink> for an introduction into multi-seat support on
-- Linux, the background for this set of APIs.</para>
-+ on GNU/Linux</ulink> for an introduction into multi-seat support on
-+ GNU/Linux, the background for this set of APIs.</para>
-
- <para>Note that these APIs only allow purely passive access and
- monitoring of seats, sessions and users. To actively make changes
-diff -Nur a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
---- a/man/sd_bus_error_add_map.xml 2015-09-11 14:55:47.369340911 -0300
-+++ b/man/sd_bus_error_add_map.xml 2015-09-11 15:31:21.081524317 -0300
-@@ -82,7 +82,7 @@
-
- <para>The <function>sd_bus_error_add_map()</function> call may be
- used to register additional mappings for converting D-Bus errors
-- to Linux <varname>errno</varname>-style errors. The mappings
-+ to GNU/Linux <varname>errno</varname>-style errors. The mappings
- defined with this call are consulted by calls such as
- <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- or
-diff -Nur a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
---- a/man/sd_is_fifo.xml 2015-09-11 14:55:47.372340932 -0300
-+++ b/man/sd_is_fifo.xml 2015-09-11 15:32:47.346188708 -0300
-@@ -145,7 +145,7 @@
- the <parameter>path</parameter> parameter is
- <constant>NULL</constant>. For normal file system
- <constant>AF_UNIX</constant> sockets, set the
-- <parameter>length</parameter> parameter to 0. For Linux abstract
-+ <parameter>length</parameter> parameter to 0. For GNU/Linux abstract
- namespace sockets, set the <parameter>length</parameter> to the
- size of the address, including the initial 0 byte, and set the
- <parameter>path</parameter> to the initial 0 byte of the socket
-diff -Nur a/man/sd_notify.xml b/man/sd_notify.xml
---- a/man/sd_notify.xml 2015-10-17 07:04:47.746947733 -0300
-+++ b/man/sd_notify.xml 2015-10-17 07:05:10.849133263 -0300
-@@ -316,7 +316,7 @@
- referenced in the <varname>$NOTIFY_SOCKET</varname> environment
- variable. If the first character of
- <varname>$NOTIFY_SOCKET</varname> is <literal>@</literal>, the
-- string is understood as Linux abstract namespace socket. The
-+ string is understood as GNU/Linux abstract namespace socket. The
- datagram is accompanied by the process credentials of the sending
- service, using SCM_CREDENTIALS.</para>
- </refsect1>
-diff -Nur a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
---- a/man/systemd-detect-virt.xml 2015-11-28 05:22:36.382154201 -0300
-+++ b/man/systemd-detect-virt.xml 2015-11-28 05:29:15.395921466 -0300
-@@ -104,16 +104,6 @@
- </row>
-
- <row>
-- <entry><varname>vmware</varname></entry>
-- <entry>VMware Workstation or Server, and related products</entry>
-- </row>
--
-- <row>
-- <entry><varname>microsoft</varname></entry>
-- <entry>Hyper-V, also known as Viridian or Windows Server Virtualization</entry>
-- </row>
--
-- <row>
- <entry><varname>oracle</varname></entry>
- <entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems)</entry>
- </row>
-@@ -146,12 +136,12 @@
-
- <row>
- <entry><varname>lxc</varname></entry>
-- <entry>Linux container implementation by LXC</entry>
-+ <entry>GNU/Linux container implementation by LXC</entry>
- </row>
-
- <row>
- <entry><varname>lxc-libvirt</varname></entry>
-- <entry>Linux container implementation by libvirt</entry>
-+ <entry>GNU/Linux container implementation by libvirt</entry>
- </row>
-
- <row>
-diff -Nur a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
---- a/man/systemd-logind.service.xml 2015-09-11 14:55:47.378340974 -0300
-+++ b/man/systemd-logind.service.xml 2015-09-11 15:45:37.799989107 -0300
-@@ -94,7 +94,7 @@
-
- <para>See <ulink
- url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat
-- on Linux</ulink> for an introduction into basic concepts of logind
-+ on GNU/Linux</ulink> for an introduction into basic concepts of logind
- such as users, sessions and seats.</para>
-
- <para>See the <ulink
-diff -Nur a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
---- a/man/systemd-machine-id-setup.xml 2015-11-28 05:22:36.385487369 -0300
-+++ b/man/systemd-machine-id-setup.xml 2015-11-28 05:27:29.717761441 -0300
-@@ -88,7 +88,7 @@
- and is different for every booted instance of the
- VM.</para></listitem>
-
-- <listitem><para>Similarly, if run inside a Linux container
-+ <listitem><para>Similarly, if run inside a GNU/Linux container
- environment and a UUID is configured for the container, this is
- used to initialize the machine ID. For details, see the
- documentation of the <ulink
-diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
---- a/man/systemd-nspawn.xml 2015-11-28 05:22:36.385487369 -0300
-+++ b/man/systemd-nspawn.xml 2015-11-28 05:36:20.668422612 -0300
-@@ -91,14 +91,14 @@
-
- <para>In contrast to
- <citerefentry project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> <command>systemd-nspawn</command>
-- may be used to boot full Linux-based operating systems in a
-+ may be used to boot full GNU/Linux-based operating systems in a
- container.</para>
-
- <para>Use a tool like
- <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- or
-- <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-+ <citerefentry project='parabola'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- to set up an OS directory tree suitable as file system hierarchy
- for <command>systemd-nspawn</command> containers.</para>
-
-@@ -852,46 +852,35 @@
- <title>Examples</title>
-
- <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>
-
-- <programlisting># machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz
--# systemd-nspawn -M Fedora-Cloud-Base-20141203-21</programlisting>
--
-- <para>This downloads an image using
-- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-- and opens a shell in it.</para>
-- </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
- # systemd-nspawn -bD /srv/mycontainer</programlisting>
-
-- <para>This installs a minimal Fedora distribution into the
-+ <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>
- </example>
-
- <example>
-- <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>
-+ <title>Spawn a shell in a container of a minimal gNewSense unstable distribution</title>
-
-- <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/
--# systemd-nspawn -D ~/debian-tree/</programlisting>
-+ <programlisting># debootstrap --arch=amd64 unstable ~/gnewsense-tree/
-+# systemd-nspawn -D ~/gnewsense-tree/</programlisting>
-
-- <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
-+ the directory <filename>~/gnewsense-tree/</filename> and then
- spawns a shell in a namespace container in it.</para>
- </example>
-
- <example>
-- <title>Boot a minimal Arch Linux distribution in a container</title>
-+ <title>Boot a minimal Parabola GNU/Linux-libre distribution in a container</title>
-
-- <programlisting># pacstrap -c -d ~/arch-tree/ base
--# systemd-nspawn -bD ~/arch-tree/</programlisting>
-+ <programlisting># pacstrap -c -d ~/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 GNU/Linux-libre distribution into the
-+ directory <filename>~/parabola-tree/</filename> and then boots an OS
- in a namespace container in it.</para>
- </example>
-
-@@ -929,7 +918,7 @@
- <citerefentry project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-- <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-+ <citerefentry project='parabola'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry project='man-pages'><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-diff -Nur a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
---- a/man/systemd-sleep.conf.xml 2015-09-11 14:55:47.380340988 -0300
-+++ b/man/systemd-sleep.conf.xml 2015-09-11 16:08:59.858313702 -0300
-@@ -165,7 +165,7 @@
- <title>Example: freeze</title>
-
- <para>Example: to exploit the <quote>freeze</quote> mode added
-- in Linux 3.9, one can use <command>systemctl suspend</command>
-+ in Linux 3.9 kernel, one can use <command>systemctl suspend</command>
- with
- <programlisting>[Sleep]
- SuspendState=freeze</programlisting></para>
-diff -Nur a/man/systemd.socket.xml b/man/systemd.socket.xml
---- a/man/systemd.socket.xml 2015-11-28 05:22:36.392153706 -0300
-+++ b/man/systemd.socket.xml 2015-11-28 05:23:08.920537132 -0300
-@@ -289,7 +289,7 @@
- <listitem><para>Specifies a POSIX message queue name to listen
- on. This expects a valid message queue name (i.e. beginning
- with /). Behavior otherwise is very similar to the
-- <varname>ListenFIFO=</varname> directive above. On Linux
-+ <varname>ListenFIFO=</varname> directive above. On GNU/Linux
- message queue descriptors are actually file descriptors and
- can be inherited between processes.</para></listitem>
- </varlistentry>
-diff -Nur a/man/systemd.xml b/man/systemd.xml
---- a/man/systemd.xml 2015-11-28 05:22:36.392153706 -0300
-+++ b/man/systemd.xml 2015-11-28 05:23:08.923870299 -0300
-@@ -61,7 +61,7 @@
- <refsect1>
- <title>Description</title>
-
-- <para>systemd is a system and service manager for Linux operating
-+ <para>systemd is a system and service manager for GNU/Linux operating
- systems. When run as first process on boot (as PID 1), it acts as
- init system that brings up and maintains userspace
- services.</para>
-@@ -852,10 +852,10 @@
- <title>Kernel Command Line</title>
-
- <para>When run as system instance systemd parses a number of
-- kernel command line arguments<footnote><para>If run inside a Linux
-+ kernel command line arguments<footnote><para>If run inside a GNU/Linux
- container these arguments may be passed as command line arguments
- to systemd itself, next to any of the command line options listed
-- in the Options section above. If run outside of Linux containers,
-+ in the Options section above. If run outside of GNU/Linux containers,
- these arguments are parsed from <filename>/proc/cmdline</filename>
- instead.</para></footnote>:</para>
-