more

author: Luke Shumaker <lukeshu@lukeshu.com> 2018-07-26 21:53:53 -0400
committer: Luke Shumaker <lukeshu@lukeshu.com> 2018-07-26 21:53:53 -0400
commit: 149e145fccb6df9f629c9145ca857a7939230c25 (patch)
tree: 530614eea927775a2d314f7cf263720b3bd11c20
parent: 075a6e76f91325a4bfd9a1ee1dcea6d92b11cd2f (diff)
83 files changed, 373 insertions, 1660 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4fd8ac0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/.var.*
+/packages/
+/src/
diff --git a/Makefile b/Makefile
index 6c4614b..7507dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,49 @@
-SYSTEMD_232 =    systemd/v232-8.parabola2
-SYSTEMD_CUR =    systemd/v239.0-2.parabola1
-SYSTEMD_NOT = notsystemd/v239.1
+CHROOT_NAME = x86_64
+CHROOT_COPY = notsystemd-tests-$(@F)
+
+GIT = https://git.parabola.nu/~lukeshu/systemd.git
+GIT.systemd-232 =    systemd/v232-8.parabola2
+GIT.systemd-cur =    systemd/v239.0-2.parabola1
+GIT.systemd-not = notsystemd/v239.1
+
+all: packages/systemd-232 packages/systemd-cur
+.PHONY: all
+
+src/systemd: .var.GIT
+	mkdir -p '$(@D)'
+	git clone --mirror '$(GIT)' '$@'
 
 id_% id_%.pub:
 	ssh-keygen -P '' -f 'id_$*'
+
+packages/%: .var.GIT.% abs/% src/systemd
+	rm -rf -- '$@' '$@.tmp'
+	mkdir -p '$(@D)'
+	cp -aT -- 'abs/$(@F)' '$@.tmp'
+	sed -i 's,@COMMIT@,$(GIT.$(@F)),g' -- '$@.tmp/PKGBUILD'
+	cd $@.tmp && sudo "PKGDEST=$$PWD" "SRCPKGDEST=$$PWD" "LOGDEST=$$PWD" 'SRCDEST=$(CURDIR)/src' libremakepkg -n '$(CHROOT_NAME)' -l '$(CHROOT_COPY)'
+	mv -T -- '$@.tmp' '$@'
+
+packages/systemd-232: $(wildcard abs/systemd-232/*)
+packages/systemd-cur: $(wildcard abs/systemd-cur/*)
+packages/systemd-not: $(wildcard abs/systemd-not/*)
+
+# Boilerplate ########################################################
+
+.var.%: FORCE
+	@printf '%s' $(call quote.shell,$($*)) | sed 's/^/#/' | ./write-ifchanged '$@'
+-include $(wildcard .var.*)
+
+.PHONY: FORCE
+.SECONDARY:
+.DELETE_ON_ERROR:
+
+define at.nl
+
+
+endef
+
+# I put this as the last line in the file because it confuses Emacs
+# syntax highlighting and makes the remainder of the file difficult to
+# edit.
+quote.shell = $(subst $(at.nl),'$$'\n'','$(subst ','\'',$1)')
diff --git a/abs/systemd-232/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/abs/systemd-232/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
deleted file mode 100644
index e91d0af..0000000
--- a/abs/systemd-232/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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/abs/systemd-232/0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch b/abs/systemd-232/0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
deleted file mode 100644
index 5d47d01..0000000
--- a/abs/systemd-232/0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 481712d9ee88395042f0640f272c1f87142bc0a8 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Wed, 9 Nov 2016 11:14:03 -0500
-Subject: [PATCH] Revert "nspawn: try to bind mount resolved's resolv.conf
- snippet into the container"
-
-This reverts commit 3539724c26a1b2b00c4eb3c004b635a4b8647de6.
----
- src/nspawn/nspawn.c | 27 ++++++++-------------------
- 1 file changed, 8 insertions(+), 19 deletions(-)
-
-diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index c8b18bc..93df7c6 100644
---- a/src/nspawn/nspawn.c
-+++ b/src/nspawn/nspawn.c
-@@ -1309,35 +1309,24 @@ static int setup_resolv_conf(const char *dest) {
-         /* Fix resolv.conf, if possible */
-         where = prefix_roota(dest, "/etc/resolv.conf");
- 
--        if (access("/usr/lib/systemd/resolv.conf", F_OK) >= 0) {
--                /* resolved is enabled on the host. In this, case bind mount its static resolv.conf file into the
--                 * container, so that the container can use the host's resolver. Given that network namespacing is
--                 * disabled it's only natural of the container also uses the host's resolver. It also has the big
--                 * advantage that the container will be able to follow the host's DNS server configuration changes
--                 * transparently. */
--
--                r = mount_verbose(LOG_WARNING, "/usr/lib/systemd/resolv.conf", where, NULL, MS_BIND, NULL);
--                if (r >= 0)
--                        return mount_verbose(LOG_ERR, NULL, where, NULL,
--                                             MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL);
--        }
--
--        /* If that didn't work, let's copy the file */
-         r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644, 0);
-         if (r < 0) {
--                /* If the file already exists as symlink, let's suppress the warning, under the assumption that
--                 * resolved or something similar runs inside and the symlink points there.
-+                /* If the file already exists as symlink, let's
-+                 * suppress the warning, under the assumption that
-+                 * resolved or something similar runs inside and the
-+                 * symlink points there.
-                  *
--                 * If the disk image is read-only, there's also no point in complaining.
-+                 * If the disk image is read-only, there's also no
-+                 * point in complaining.
-                  */
-                 log_full_errno(IN_SET(r, -ELOOP, -EROFS) ? LOG_DEBUG : LOG_WARNING, r,
--                               "Failed to copy /etc/resolv.conf to %s, ignoring: %m", where);
-+                               "Failed to copy /etc/resolv.conf to %s: %m", where);
-                 return 0;
-         }
- 
-         r = userns_lchown(where, 0, 0);
-         if (r < 0)
--                log_warning_errno(r, "Failed to chown /etc/resolv.conf, ignoring: %m");
-+                log_warning_errno(r, "Failed to chown /etc/resolv.conf: %m");
- 
-         return 0;
- }
--- 
-2.10.2
-
diff --git a/abs/systemd-232/0001-disable-RestrictAddressFamilies-on-i686.patch b/abs/systemd-232/0001-disable-RestrictAddressFamilies-on-i686.patch
deleted file mode 100644
index 27e6f4f..0000000
--- a/abs/systemd-232/0001-disable-RestrictAddressFamilies-on-i686.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ff59e06f9423af0532aaeedf931474823f764875 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Wed, 9 Nov 2016 08:00:26 -0500
-Subject: [PATCH] disable RestrictAddressFamilies on i686
-
-Shit's broke, yo.
-
-https://github.com/systemd/systemd/issues/4575
----
- src/core/execute.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/core/execute.c b/src/core/execute.c
-index f666f7c..7d09154 100644
---- a/src/core/execute.c
-+++ b/src/core/execute.c
-@@ -1254,6 +1254,10 @@ static int apply_address_families(const Unit* u, const ExecContext *c) {
-         Iterator i;
-         int r;
- 
-+#if defined(__i386__)
-+        return 0;
-+#endif
-+
-         assert(c);
- 
-         if (skip_seccomp_unavailable(u, "RestrictAddressFamilies="))
--- 
-2.10.2
-
diff --git a/abs/systemd-232/0001-nspawn-don-t-hide-bind-tmp-mounts.patch b/abs/systemd-232/0001-nspawn-don-t-hide-bind-tmp-mounts.patch
deleted file mode 100644
index a5336ec..0000000
--- a/abs/systemd-232/0001-nspawn-don-t-hide-bind-tmp-mounts.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7ec42a45410cb27140292d85ebb0e4b6dcea5555 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Wed, 7 Dec 2016 13:45:48 -0500
-Subject: [PATCH] nspawn: don't hide --bind=/tmp/* mounts
-
-This is a v232-applicable version of upstream c9fd987279a462e.
----
- src/nspawn/nspawn-mount.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
-index 115de64..2dabe2a 100644
---- a/src/nspawn/nspawn-mount.c
-+++ b/src/nspawn/nspawn-mount.c
-@@ -382,7 +382,7 @@ int mount_all(const char *dest,
-                 { "tmpfs",               "/dev",                "tmpfs", "mode=755",  MS_NOSUID|MS_STRICTATIME,                                  true,  false, false },
-                 { "tmpfs",               "/dev/shm",            "tmpfs", "mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME,                         true,  false, false },
-                 { "tmpfs",               "/run",                "tmpfs", "mode=755",  MS_NOSUID|MS_NODEV|MS_STRICTATIME,                         true,  false, false },
--                { "tmpfs",               "/tmp",                "tmpfs", "mode=1777", MS_STRICTATIME,                                            true,  true,  false },
-+                { "tmpfs",               "/tmp",                "tmpfs", "mode=1777", MS_STRICTATIME,                                            true,  false,  false },
- #ifdef HAVE_SELINUX
-                 { "/sys/fs/selinux",     "/sys/fs/selinux",     NULL,     NULL,       MS_BIND,                                                   false, false, false },  /* Bind mount first */
-                 { NULL,                  "/sys/fs/selinux",     NULL,     NULL,       MS_BIND|MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REMOUNT, false, false, false },  /* Then, make it r/o */
--- 
-2.10.2
-
diff --git a/abs/systemd-232/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/abs/systemd-232/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
deleted file mode 100644
index 59ab5be..0000000
--- a/abs/systemd-232/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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                           | 4 +-
- src/firstboot/firstboot.c                 | 2 +-
- src/kernel-install/90-loaderentry.install | 2 +-
- 6 files changed, 7 insertions(+), 7 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 d621f66..53c97f9 100644
---- a/src/analyze/analyze.c
-+++ b/src/analyze/analyze.c
-@@ -653,7 +653,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 93098da..b9cac92 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1238,11 +1238,11 @@ 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);
-         else
-                 return status_printf(NULL, false, false,
-                                      "\nWelcome to %s!\n",
--                                     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 3df7246..1e1a592 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/abs/systemd-232/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/abs/systemd-232/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch
deleted file mode 100644
index d6c4058..0000000
--- a/abs/systemd-232/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/abs/systemd-232/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/abs/systemd-232/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
deleted file mode 100644
index 8a130ab..0000000
--- a/abs/systemd-232/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/abs/systemd-232/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch b/abs/systemd-232/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch
deleted file mode 100644
index f5e9de8..0000000
--- a/abs/systemd-232/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/abs/systemd-232/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/abs/systemd-232/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
deleted file mode 100644
index 9a8ce15..0000000
--- a/abs/systemd-232/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-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 caf60f4..2811f43 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>
-@@ -199,8 +199,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>
-@@ -211,8 +211,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>
-@@ -235,7 +235,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>
- 
-@@ -270,8 +270,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>
-@@ -346,21 +346,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 cd0a90d..ab35580 100644
---- a/man/systemd-nspawn.xml
-+++ b/man/systemd-nspawn.xml
-@@ -1004,46 +1004,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/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz
--# systemd-nspawn -M Fedora-Cloud-Base-24-1.2.x86_64.raw</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 Ucclia distribution</title>
- 
--      <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/
--# systemd-nspawn -D ~/debian-tree/</programlisting>
-+      <programlisting># debootstrap --arch=amd64 ucclia ~/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 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 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/abs/systemd-232/PKGBUILD b/abs/systemd-232/PKGBUILD
index d25f533..95c176b 100644
--- a/abs/systemd-232/PKGBUILD
+++ b/abs/systemd-232/PKGBUILD
@@ -1,22 +1,29 @@
+# Maintainer (Arch): Christian Hesse <mail@eworm.de>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat'
-         'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
+pkgname+=('systemd-common' 'systemd-udev')
+# We split Arch's libsystemd into the systemd-$X, for the following $X:
+_libsystemd=('libsystemd' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
+pkgname+=("${_libsystemd[@]/#/systemd-}")
+_commit=@COMMIT@
 pkgver=232
-pkgrel=8.parabola2
+pkgrel=99
 arch=('i686' 'x86_64' 'armv7h')
-url="https://www.github.com/systemd/systemd"
-makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf>=3.1' 'lz4' 'xz' 'pam' 'libelf'
+url='https://www.github.com/systemd/systemd'
+makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-libre-api-headers'
-             'python-lxml' 'quota-tools' 'shadow' 'git')
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+             'python-lxml' 'quota-tools' 'shadow' 'git'
+)
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
-source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
+source=("git+https://git.parabola.nu/~lukeshu/systemd.git#commit=${_commit}"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -24,117 +31,44 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'loader.conf'
         'splash-parabola.bmp'
         'systemd-user.pam'
+        'systemd-hook'
+        'udev-hook'
+        'systemd-binfmt.hook'
+        'systemd-catalog.hook'
+        'systemd-daemon-reload.hook'
         'systemd-hwdb.hook'
+        'systemd-sysctl.hook'
         'systemd-sysusers.hook'
         'systemd-tmpfiles.hook'
-        'systemd-update.hook'
-        '0001-disable-RestrictAddressFamilies-on-i686.patch'
-        '0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch'
-        '0001-nspawn-don-t-hide-bind-tmp-mounts.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')
+        'systemd-udev-reload.hook'
+        'systemd-update.hook')
 sha512sums=('SKIP'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28'
-            'fec639de0d99967ed3e67289eff5ff78fff0c5829d350e73bed536a8391f1daa1d118d72dbdc1f480ffd33fc22b72f4817d0973bd09ec7f182fd26ad87b24355'
+            '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
+            'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'
             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
             'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
-            '9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
-            '0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
-            '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618'
-            '89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f'
-            'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219'
-            '68478403433aafc91a03fda5d83813d2ed1dfc6ab7416b2927a803314ecf826edcb6c659587e74df65de3ccb1edf958522f56ff9ac461a1f696b6dede1d4dd35'
-            '50888d94636427ca97bfa5355226163fb6458f2a60303967cf74a8fd085f3c450d276b7c556fea93da387c6bb6f5ecbdb6d9b2a571b6723f27a41c8fb612d27b'
-            'fc8b874279db428a342387147ef6a849c0621eb0326ad5c4eb12c2ceb98b46477ed1e07c076a8b0abae6b323d4d7f4c70d45998c3338fb89903f51b3f653458b'
-            'fd928f5d10a5f95bdbab7720b465cbea8b47cf1a376e1ba292c4759d3f1473c80bd4444729dc5b6f6d884e342db7d07a5dad093d345ccccf2c5fb22dfcdacbd8'
-            '723db0e4980727594c88d2fc92ffde10cf7c5cd05fbd88a31dadb813a3c839c3a92b3e5789f936de356b9f5e2d43d67e95fd02627be53ffa46b3d86dfabc4e5b'
-            '77161e2f57237ca589d576924ec0877f379047c6fd90ca47cb6686e4f22cc9e2171ae4306bd5a9fd8e707e297b826e0f7df52dcdcb04e99df7ebd0eb45ac89eb'
-            'caa5eb7e52b83549bc7d00e343bbb204334b49f2d14005ac1fb592c6f17c6c860edafd88abe619fe54cb0086725385c1f48fd437670a31a08abdac8485ed2073')
-validpgpkeys=(
-  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
-)
-
-_backports=(
-  '843d5baf6aad6c53fc00ea8d95d83209a4f92de1'  # core: don't use the unified hierarchy for the systemd cgroup yet (#4628)
-  'abd67ce74858491565cde157c7b08fda43d3279c'  # basic/virt: fix userns check on CONFIG_USER_NS=n kernel (#4651)
-  '4318abe8d26e969ebdb97744a63ab900233a0185'  # build-sys: do not install ctrl-alt-del.target symlink twice
-  'd112eae7da77899be245ab52aa1747d4675549f1'  # device: Avoid calling unit_free(NULL) in device setup logic (#4748)
-  'cfed63f60dd7412c199652825ed172c319b02b3c'  # nspawn: fix exit code for --help and --version (#4609)
-  '3099caf2b5bb9498b1d0227c40926435ca81f26f'  # journal: make sure to initially populate the space info cache (#4807)
-  '3d4cf7de48a74726694abbaa09f9804b845ff3ba'  # build-sys: check for lz4 in the old and new numbering scheme (#4717)
-  'c9f7b4d356a453a01aa77a6bb74ca7ef49732c08'  # build-sys: add check for gperf lookup function signature (#5055)
-)
-
-_validate_tag() {
-  local success fingerprint trusted status tag=v$pkgver
-
-  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
-  if (( ! success )); then
-    error 'failed to validate tag %s\n' "$tag"
-    return 1
-  fi
-
-  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-    return 1
-  fi
-
-  case $status in
-    'expired')
-      warning 'the signature has expired'
-      ;;
-    'expiredkey')
-      warning 'the key has expired'
-      ;;
-  esac
-
-  return 0
-}
+            '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40'
+            'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'
+            '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
+            '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
+            '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
+            '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc'
+            'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
+            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
+            '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
+            'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
+            '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
 
 prepare() {
-  cd "$pkgbase"
-
-  _validate_tag || return
-
-  if (( ${#_backports[*]} > 0 )); then
-    git cherry-pick -n "${_backports[@]}"
-  fi
-
-  # https://github.com/systemd/systemd/issues/4789
-  patch -Np1 <../0001-nspawn-don-t-hide-bind-tmp-mounts.patch
-
-  # these patches aren't upstream, but they make v232 more useable.
-
-  # https://github.com/systemd/systemd/issues/4575
-  patch -Np1 <../0001-disable-RestrictAddressFamilies-on-i686.patch
-
-  # https://github.com/systemd/systemd/issues/4595
-  # https://github.com/systemd/systemd/issues/3826
-  patch -Np1 <../0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
-
-  # apply FSDG patches
-  local patchfile
-  for patchfile in "$srcdir"/????-FSDG-*.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
-
+  cd "$srcdir/$pkgbase"
   ./autogen.sh
 }
 
 build() {
-  cd "$pkgbase"
+  cd "$srcdir/$pkgbase"
 
   local timeservers=({0..3}.arch.pool.ntp.org)
 
@@ -175,6 +109,9 @@ build() {
   # Put things in the main systemd package by default
   make DESTDIR="$srcdir/dest/systemd" install
 
+  install -dm755 "$srcdir/dest/common"/usr/lib/systemd
+  mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so
+
   install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}
   mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd
   mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc
@@ -187,29 +124,44 @@ build() {
   mv "$srcdir/dest"/systemd/usr/lib/libudev.so*       -t "$srcdir/dest"/libudev/usr/lib/
   mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/
 
+  install -dm755 "$srcdir/dest/udev"/{etc,usr/lib}
+  mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/
+  mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/
+  while read -d '' -r file; do
+    install -dm755 "$srcdir/dest/udev/${file%/*}"
+    mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file"
+  done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0')
+
   local nssmodule
   for nssmodule in myhostname mymachines resolve; do
     install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}
-    mv -T "$srcdir/dest"/{systemd,nss-$nssmodule}/usr/share/man/man8/nss-$nssmodule.8
+    mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \
+       "$srcdir/dest"/systemd/usr/share/man/man8/*nss?$nssmodule.*
     mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/
   done
 
   install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
-  mv "$srcdir/dest/systemd"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+  mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
      -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
 
   rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}
 }
 
+check() {
+  : # TODO
+}
+
 package_systemd() {
-  pkgdesc="system and service manager"
-  license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
-           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
-           'util-linux' 'xz')
-  provides=("systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('systemd-tools' 'udev')
-  conflicts=('systemd-tools' 'udev')
+  pkgdesc='system and service manager'
+  license=('LGPL2.1')
+  groups=('base-devel')
+  depends=('bash' 'dbus' 'kbd' 'kmod'
+           'libsystemd' 'pam' 'libelf'
+           'util-linux')
+  depends+=("systemd-common=$pkgver" 'udev')
+  provides=("systemd-tools=$pkgver")
+  replaces=('systemd-tools')
+  conflicts=('systemd-tools')
   optdepends=('cryptsetup: required for encrypted block devices'
               'libmicrohttpd: remote journald capabilities'
               'quota-tools: kernel-level quota management'
@@ -224,22 +176,18 @@ package_systemd() {
           etc/systemd/system.conf
           etc/systemd/timesyncd.conf
           etc/systemd/resolved.conf
-          etc/systemd/user.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
+          etc/systemd/user.conf)
+  install=systemd.install
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgbase" "$pkgdir"
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
-  rm -r "$pkgdir/etc/systemd/system/"*.wants
+  rm -rv "$pkgdir"/etc/systemd/system/*
 
   # get rid of RPM macros
   rm -r "$pkgdir/usr/lib/rpm"
 
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgbase/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
-
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
           s#GROUP="tape"#GROUP="storage"#g;
@@ -248,98 +196,155 @@ package_systemd() {
           s/tape/storage/g;
           s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
 
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
-  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
-
-  # ensure proper permissions for /var/log/journal. This is only to placate
-  chown root:systemd-journal "$pkgdir/var/log/journal"
-  chmod 2755 "$pkgdir/var/log/journal"
-
   # we'll create this on installation
-  rmdir "$pkgdir/var/log/journal/remote"
+  rmdir "$pkgdir"/var/log/journal/remote
+
+  # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
+  install -m0644 $pkgbase/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
 
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
+  # add mkinitcpio hooks
+  install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
+
+  # ensure proper permissions for /var/log/journal
+  # The permissions are stored with named group by tar, so this works with
+  # users and groups populated by systemd-sysusers. This is only to prevent a
+  # warning from pacman as permissions are set by systemd-tmpfiles anyway.
+  install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal
+
+
   # add example bootctl configuration
-  install -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf
-  install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf
-  install -Dm644 "$srcdir/splash-parabola.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp
+  install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf
+  install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf
+  install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp
 
-  install -Dm644 "$srcdir/systemd-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook"
-  install -Dm644 "$srcdir/systemd-sysusers.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
-  install -Dm644 "$srcdir/systemd-tmpfiles.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
-  install -Dm644 "$srcdir/systemd-update.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-update.hook"
+  # pacman hooks
+  install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook
+  install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook
+  rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}*
 
   # overwrite the systemd-user PAM configuration with our own
-  install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user"
+  install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
+}
+
+package_systemd-common() {
+  pkgdesc='systemd files shared between split packages'
+  license=('LGPL2.1')
+  depends=('acl' 'libdbus' 'glibc' 'iptables' 'libcap'
+           'libgcrypt' 'libidn' 'libseccomp' 'libsystemd.so'
+           'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'
+           'xz')
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
+}
+
+package_systemd-udev() {
+  pkgdesc='Userspace device file manager'
+  license=('GPL2') # NB: different than the rest
+  groups=('base' 'base-devel')
+  depends=("systemd-common=$pkgver" 'systemd-libudev'
+           'hwids' 'kmod' 'util-linux' 'zlib')
+  backup=(etc/udev/udev.conf)
+
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
+
+  # add mkinitcpio hooks
+  install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
+  install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
+
+  # pacman hooks
+  install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook
+  install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook
 }
 
 package_libsystemd() {
-  pkgdesc="systemd client libraries metapackage"
-  depends=(libsystemd-standalone libudev nss-myhostname nss-mymachines nss-resolve)
-  license=('GPL2')
+  pkgdesc='systemd client libraries metapackage'
+  depends=("${_libsystemd[@]/libsystemd/libsystemd.so}")
+  license=('LGPL2.1')
 }
 
-package_libsystemd-standalone() {
-  pkgdesc="systemd client library"
+package_systemd-libsystemd() {
+  pkgdesc='systemd client library'
   depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
-  license=('GPL2')
+  license=('LGPL2.1')
   provides=('libsystemd.so')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/libsystemd" "$pkgdir"
+  provides+=("libsystemd-standalone=$pkgver")
+  conflicts+=('libsystemd-standalone')
+  replaces+=('libsystemd-standalone')
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_libudev() {
-  pkgdesc="systemd library for enumerating and introspecting local devices"
+package_systemd-libudev() {
+  pkgdesc='systemd library for enumerating and introspecting local devices'
   depends=('glibc' 'libcap')
-  license=('GPL2')
+  license=('LGPL2.1')
   provides=('libudev.so')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-myhostname() {
-  pkgdesc="NSS module providing hostname resolution for the locally configured system hostname"
+package_systemd-nss-myhostname() {
+  pkgdesc='NSS module providing hostname resolution for the locally configured system hostname'
   depends=('glibc' 'libcap')
-  license=('GPL2')
+  license=('LGPL2.1')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-mymachines() {
-  pkgdesc="NSS module providing hostname resolution for local systemd-machined container instances"
+package_systemd-nss-mymachines() {
+  pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances'
   depends=('glibc' 'libcap')
-  license=('GPL2')
+  license=('LGPL2.1')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
-package_nss-resolve() {
-  pkgdesc="NSS module providing hostname resolution via systemd-resolved"
+package_systemd-nss-resolve() {
+  pkgdesc='NSS module providing hostname resolution via systemd-resolved'
   depends=('glibc' 'libcap')
-  license=('GPL2')
+  license=('LGPL2.1')
 
-  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+  provides+=("${pkgname#systemd-}=$pkgver")
+  conflicts+=("${pkgname#systemd-}")
+  replaces+=("${pkgname#systemd-}")
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
 
 package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  license=('GPL2')
+  pkgdesc='sysvinit compat for systemd'
+  license=('LGPL2.1')
   groups=('base')
   conflicts=('sysvinit')
   depends=('systemd')
 
   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
 
-  install -dm755 "$pkgdir/usr/bin"
+  install -d -m0755 "$pkgdir"/usr/bin
+  ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
   for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
+    ln -s systemctl "$pkgdir"/usr/bin/$tool
   done
-
-  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
 }
 
 # vim: ft=sh syn=sh et
diff --git a/abs/systemd-232/initcpio-install-systemd b/abs/systemd-232/initcpio-install-systemd
index f6d0afd..8fb4441 100644
--- a/abs/systemd-232/initcpio-install-systemd
+++ b/abs/systemd-232/initcpio-install-systemd
@@ -112,10 +112,15 @@ build() {
     map add_binary \
         /usr/bin/systemd-tmpfiles \
         /usr/lib/systemd/systemd-hibernate-resume \
+        /usr/lib/systemd/systemd-shutdown \
+        /usr/lib/systemd/systemd-sulogin-shell \
         /usr/lib/systemd/system-generators/systemd-fstab-generator \
         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
 
+    # for journalctl in emergency shell
+    add_binary journalctl
+
     # udev rules and systemd units
     map add_udev_rule "$rules" \
             50-udev-default.rules \
@@ -160,9 +165,11 @@ build() {
     add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
     add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
 
-    # udev wants /etc/group since it doesn't launch with --resolve-names=never
-    add_file "/etc/nsswitch.conf"
     add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
+        'passwd: files' \
+        'group: files' \
+        'shadow: files'
 
     echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
     echo "root:x:0:root" >"$BUILDROOT/etc/group"
@@ -178,7 +185,7 @@ EOF
     (
       . "$_f_config"
       set -f
-      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+      printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
     )
 }
 
diff --git a/abs/systemd-232/initcpio-install-udev b/abs/systemd-232/initcpio-install-udev
index 7f0301a..31d9827 100644
--- a/abs/systemd-232/initcpio-install-udev
+++ b/abs/systemd-232/initcpio-install-udev
@@ -19,9 +19,10 @@ build() {
 
 help() {
     cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
+This hook adds the udev daemon to the initramfs, allowing for dynamic loading
+of modules and reliable detection of the root device via tags (e.g. UUID or
+LABEL). Do not remove this hook unless you are using the systemd hook, or you
+know what you're doing.
 HELPEOF
 }
 
diff --git a/abs/notsystemd/systemd-binfmt.hook b/abs/systemd-232/systemd-binfmt.hook
index 9c31a4b..9c31a4b 100644
--- a/abs/notsystemd/systemd-binfmt.hook
+++ b/abs/systemd-232/systemd-binfmt.hook
diff --git a/abs/notsystemd/systemd-catalog.hook b/abs/systemd-232/systemd-catalog.hook
index d28bddc..d28bddc 100644
--- a/abs/notsystemd/systemd-catalog.hook
+++ b/abs/systemd-232/systemd-catalog.hook
diff --git a/abs/notsystemd/systemd-daemon-reload.hook b/abs/systemd-232/systemd-daemon-reload.hook
index 87923e8..87923e8 100644
--- a/abs/notsystemd/systemd-daemon-reload.hook
+++ b/abs/systemd-232/systemd-daemon-reload.hook
diff --git a/abs/notsystemd/systemd-hook b/abs/systemd-232/systemd-hook
index 793a429..793a429 100644
--- a/abs/notsystemd/systemd-hook
+++ b/abs/systemd-232/systemd-hook
diff --git a/abs/systemd-232/systemd-hwdb.hook b/abs/systemd-232/systemd-hwdb.hook
index d7c9877..ec5bcfb 100644
--- a/abs/systemd-232/systemd-hwdb.hook
+++ b/abs/systemd-232/systemd-hwdb.hook
@@ -8,4 +8,4 @@ Target = usr/lib/udev/hwdb.d/*
 [Action]
 Description = Updating udev hardware database...
 When = PostTransaction
-Exec = /usr/bin/systemd-hwdb --usr update
+Exec = /usr/share/libalpm/scripts/udev-hook hwdb
diff --git a/abs/notsystemd/systemd-sysctl.hook b/abs/systemd-232/systemd-sysctl.hook
index aec5ac1..aec5ac1 100644
--- a/abs/notsystemd/systemd-sysctl.hook
+++ b/abs/systemd-232/systemd-sysctl.hook
diff --git a/abs/systemd-232/systemd-sysusers.hook b/abs/systemd-232/systemd-sysusers.hook
index b0888d7..9873dd4 100644
--- a/abs/systemd-232/systemd-sysusers.hook
+++ b/abs/systemd-232/systemd-sysusers.hook
@@ -5,7 +5,6 @@ Operation = Upgrade
 Target = usr/lib/sysusers.d/*.conf
 
 [Action]
-Description = Updating system user accounts...
+Description = Creating system user accounts...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
-NeedsTargets
+Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
diff --git a/abs/systemd-232/systemd-tmpfiles.hook b/abs/systemd-232/systemd-tmpfiles.hook
index a2c5e3e..df60d82 100644
--- a/abs/systemd-232/systemd-tmpfiles.hook
+++ b/abs/systemd-232/systemd-tmpfiles.hook
@@ -7,5 +7,4 @@ Target = usr/lib/tmpfiles.d/*.conf
 [Action]
 Description = Creating temporary files...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "/$f"; done'
-NeedsTargets
+Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
diff --git a/abs/notsystemd/systemd-udev-reload.hook b/abs/systemd-232/systemd-udev-reload.hook
index 418515d..418515d 100644
--- a/abs/notsystemd/systemd-udev-reload.hook
+++ b/abs/systemd-232/systemd-udev-reload.hook
diff --git a/abs/systemd-232/systemd-update.hook b/abs/systemd-232/systemd-update.hook
index 3697fbd..7084a0c 100644
--- a/abs/systemd-232/systemd-update.hook
+++ b/abs/systemd-232/systemd-update.hook
@@ -8,4 +8,4 @@ Target = usr/
 [Action]
 Description = Arming ConditionNeedsUpdate...
 When = PostTransaction
-Exec = /usr/bin/touch -c /usr
+Exec = /usr/share/libalpm/scripts/systemd-hook update
diff --git a/abs/systemd-232/systemd.install b/abs/systemd-232/systemd.install
index f799c88..6a90b1f 100644
--- a/abs/systemd-232/systemd.install
+++ b/abs/systemd-232/systemd.install
@@ -82,7 +82,7 @@ post_upgrade() {
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
-      "_${v//-/_}_changes"
+      "_${v//[.-]/_}_changes"
     fi
   done
 }
diff --git a/abs/notsystemd/udev-hook b/abs/systemd-232/udev-hook
index 61d8532..61d8532 100644
--- a/abs/notsystemd/udev-hook
+++ b/abs/systemd-232/udev-hook
diff --git a/abs/systemd/PKGBUILD b/abs/systemd-cur/PKGBUILD
index b05fb3a..bc2d69b 100644
--- a/abs/systemd/PKGBUILD
+++ b/abs/systemd-cur/PKGBUILD
@@ -10,13 +10,10 @@ pkgname+=('systemd-common' 'systemd-udev')
 # We split Arch's libsystemd into the systemd-$X, for the following $X:
 _libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_libsystemd[@]/#/systemd-}")
-# Can be from either systemd or systemd-stable
-_commit='de7436b02badc82200dc127ff190b8155769b8e7'
+_commit=@COMMIT@
 pkgver=239.0
-pkgrel=2
-pkgrel+=.parabola4
-arch=('x86_64')
-arch+=('i686' 'armv7h')
+pkgrel=99
+arch=('i686' 'x86_64' 'armv7h')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
@@ -26,12 +23,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
 makedepends_i686=('gnu-efi-libs')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
-validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
-              '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=(# fragment is latest tag for source verification, final merge in prepare()
-        "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
-        "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
-        '0001-Use-Arch-Linux-device-access-groups.patch'
+source=("git+https://git.parabola.nu/~lukeshu/systemd.git#commit=${_commit}"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -49,17 +41,8 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         'systemd-sysusers.hook'
         'systemd-tmpfiles.hook'
         'systemd-udev-reload.hook'
-        'systemd-update.hook'
-        '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
-        '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'
-        '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'
-        '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
-        '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'
-        '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'
-        '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')
+        'systemd-update.hook')
 sha512sums=('SKIP'
-            'SKIP'
-            '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
@@ -77,59 +60,11 @@ sha512sums=('SKIP'
             '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
             '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
             'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
-            '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
-            'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'
-            'ae00ccf95c8cf5b6051d7c316eed36a450939d40d0d2c62aaa0ba16eb6fe3a3b1d703ea73593ff2e73f2268d30fb3dce3810528b15c9259353c3a4c158b0cc38'
-            'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
-            'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
-            '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
-            'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83'
-            '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
-
-_backports=(
-)
-
-_reverts=(
-)
-
-prepare() {
-  cd "$pkgbase-stable"
-
-  # add upstream repository for cherry-picking
-  git remote add -f upstream ../systemd
-  # merge the latest stable commit (fast-foward only to make sure
-  # the verified tag is in)
-  git merge --ff-only "${_commit}"
-
-  local c
-  for c in "${_backports[@]}"; do
-    git cherry-pick -n "$c"
-  done
-  for c in "${_reverts[@]}"; do
-    git revert -n "$c"
-  done
-
-  # Replace cdrom/dialout/tape groups with optical/uucp/storage
-  patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
-
-  # apply FSDG patches
-  local _patch
-  for _patch in "$srcdir"/????-FSDG-*.patch; do
-    patch -Np1 -i "$_patch"
-  done
-}
-
-pkgver() {
-  local version count
-
-  cd "$pkgbase-stable"
-
-  version="$(git describe --abbrev=0 --tags)"
-  count="$(git rev-list --count ${version}..)"
-  printf '%s.%s' "${version#v}" "${count}"
-}
+            '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
 
 build() {
+  cd "$srcdir/$pkgbase"
+
   local timeservers=({0..3}.arch.pool.ntp.org)
 
   if [ "$CARCH" = "armv7h" ]; then
@@ -196,8 +131,7 @@ build() {
   for nssmodule in systemd myhostname mymachines resolve; do
     install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}
     mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \
-       "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \
-       "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8
+       "$srcdir/dest"/systemd/usr/share/man/man8/*nss?$nssmodule.*
     mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/
   done
 
@@ -260,7 +194,7 @@ package_systemd() {
   sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
 
   # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
-  install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
+  install -m0644 $pkgbase/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
 
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
diff --git a/abs/notsystemd/initcpio-hook-udev b/abs/systemd-cur/initcpio-hook-udev
index ea9a11f..ea9a11f 100644
--- a/abs/notsystemd/initcpio-hook-udev
+++ b/abs/systemd-cur/initcpio-hook-udev
diff --git a/abs/notsystemd/initcpio-install-systemd b/abs/systemd-cur/initcpio-install-systemd
index 8fb4441..8fb4441 100644
--- a/abs/notsystemd/initcpio-install-systemd
+++ b/abs/systemd-cur/initcpio-install-systemd
diff --git a/abs/notsystemd/initcpio-install-udev b/abs/systemd-cur/initcpio-install-udev
index 31d9827..31d9827 100644
--- a/abs/notsystemd/initcpio-install-udev
+++ b/abs/systemd-cur/initcpio-install-udev
diff --git a/abs/notsystemd/loader.conf b/abs/systemd-cur/loader.conf
index a064e34..a064e34 100644
--- a/abs/notsystemd/loader.conf
+++ b/abs/systemd-cur/loader.conf
diff --git a/abs/notsystemd/parabola.conf b/abs/systemd-cur/parabola.conf
index 111072e..111072e 100644
--- a/abs/notsystemd/parabola.conf
+++ b/abs/systemd-cur/parabola.conf
diff --git a/abs/notsystemd/splash-parabola.bmp b/abs/systemd-cur/splash-parabola.bmp
index 471ac8e..471ac8e 100644
--- a/abs/notsystemd/splash-parabola.bmp
+++ b/abs/systemd-cur/splash-parabola.bmp
diff --git a/abs/systemd/systemd-binfmt.hook b/abs/systemd-cur/systemd-binfmt.hook
index 9c31a4b..9c31a4b 100644
--- a/abs/systemd/systemd-binfmt.hook
+++ b/abs/systemd-cur/systemd-binfmt.hook
diff --git a/abs/systemd/systemd-catalog.hook b/abs/systemd-cur/systemd-catalog.hook
index d28bddc..d28bddc 100644
--- a/abs/systemd/systemd-catalog.hook
+++ b/abs/systemd-cur/systemd-catalog.hook
diff --git a/abs/systemd/systemd-daemon-reload.hook b/abs/systemd-cur/systemd-daemon-reload.hook
index 87923e8..87923e8 100644
--- a/abs/systemd/systemd-daemon-reload.hook
+++ b/abs/systemd-cur/systemd-daemon-reload.hook
diff --git a/abs/systemd/systemd-hook b/abs/systemd-cur/systemd-hook
index 793a429..793a429 100644
--- a/abs/systemd/systemd-hook
+++ b/abs/systemd-cur/systemd-hook
diff --git a/abs/notsystemd/systemd-hwdb.hook b/abs/systemd-cur/systemd-hwdb.hook
index ec5bcfb..ec5bcfb 100644
--- a/abs/notsystemd/systemd-hwdb.hook
+++ b/abs/systemd-cur/systemd-hwdb.hook
diff --git a/abs/systemd/systemd-sysctl.hook b/abs/systemd-cur/systemd-sysctl.hook
index aec5ac1..aec5ac1 100644
--- a/abs/systemd/systemd-sysctl.hook
+++ b/abs/systemd-cur/systemd-sysctl.hook
diff --git a/abs/notsystemd/systemd-sysusers.hook b/abs/systemd-cur/systemd-sysusers.hook
index 9873dd4..9873dd4 100644
--- a/abs/notsystemd/systemd-sysusers.hook
+++ b/abs/systemd-cur/systemd-sysusers.hook
diff --git a/abs/notsystemd/systemd-tmpfiles.hook b/abs/systemd-cur/systemd-tmpfiles.hook
index df60d82..df60d82 100644
--- a/abs/notsystemd/systemd-tmpfiles.hook
+++ b/abs/systemd-cur/systemd-tmpfiles.hook
diff --git a/abs/systemd/systemd-udev-reload.hook b/abs/systemd-cur/systemd-udev-reload.hook
index 418515d..418515d 100644
--- a/abs/systemd/systemd-udev-reload.hook
+++ b/abs/systemd-cur/systemd-udev-reload.hook
diff --git a/abs/notsystemd/systemd-update.hook b/abs/systemd-cur/systemd-update.hook
index 7084a0c..7084a0c 100644
--- a/abs/notsystemd/systemd-update.hook
+++ b/abs/systemd-cur/systemd-update.hook
diff --git a/abs/notsystemd/systemd-user.pam b/abs/systemd-cur/systemd-user.pam
index 83f7626..83f7626 100644
--- a/abs/notsystemd/systemd-user.pam
+++ b/abs/systemd-cur/systemd-user.pam
diff --git a/abs/notsystemd/systemd.install b/abs/systemd-cur/systemd.install
index fedc747..fedc747 100644
--- a/abs/notsystemd/systemd.install
+++ b/abs/systemd-cur/systemd.install
diff --git a/abs/systemd/udev-hook b/abs/systemd-cur/udev-hook
index 61d8532..61d8532 100644
--- a/abs/systemd/udev-hook
+++ b/abs/systemd-cur/udev-hook
diff --git a/abs/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/abs/systemd-not/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
index b0e9232..b0e9232 100644
--- a/abs/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
+++ b/abs/systemd-not/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
diff --git a/abs/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch b/abs/systemd-not/0001-Use-Arch-Linux-device-access-groups.patch
index c511144..c511144 100644
--- a/abs/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch
+++ b/abs/systemd-not/0001-Use-Arch-Linux-device-access-groups.patch
diff --git a/abs/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/abs/systemd-not/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
index 1f49c9e..1f49c9e 100644
--- a/abs/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
+++ b/abs/systemd-not/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
diff --git a/abs/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/abs/systemd-not/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
index 401d284..401d284 100644
--- a/abs/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
+++ b/abs/systemd-not/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
diff --git a/abs/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/abs/systemd-not/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
index 58e157b..58e157b 100644
--- a/abs/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
+++ b/abs/systemd-not/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
diff --git a/abs/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/abs/systemd-not/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
index 5e170ce..5e170ce 100644
--- a/abs/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
+++ b/abs/systemd-not/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
diff --git a/abs/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/abs/systemd-not/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
index 0905e6b..0905e6b 100644
--- a/abs/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
+++ b/abs/systemd-not/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
diff --git a/abs/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/abs/systemd-not/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
index 0fe5def..0fe5def 100644
--- a/abs/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
+++ b/abs/systemd-not/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
diff --git a/abs/notsystemd/PKGBUILD b/abs/systemd-not/PKGBUILD
index 09678d1..09678d1 100644
--- a/abs/notsystemd/PKGBUILD
+++ b/abs/systemd-not/PKGBUILD
diff --git a/abs/systemd/initcpio-hook-udev b/abs/systemd-not/initcpio-hook-udev
index ea9a11f..ea9a11f 100644
--- a/abs/systemd/initcpio-hook-udev
+++ b/abs/systemd-not/initcpio-hook-udev
diff --git a/abs/systemd/initcpio-install-systemd b/abs/systemd-not/initcpio-install-systemd
index 8fb4441..8fb4441 100644
--- a/abs/systemd/initcpio-install-systemd
+++ b/abs/systemd-not/initcpio-install-systemd
diff --git a/abs/systemd/initcpio-install-udev b/abs/systemd-not/initcpio-install-udev
index 31d9827..31d9827 100644
--- a/abs/systemd/initcpio-install-udev
+++ b/abs/systemd-not/initcpio-install-udev
diff --git a/abs/systemd/loader.conf b/abs/systemd-not/loader.conf
index a064e34..a064e34 100644
--- a/abs/systemd/loader.conf
+++ b/abs/systemd-not/loader.conf
diff --git a/abs/systemd/parabola.conf b/abs/systemd-not/parabola.conf
index 111072e..111072e 100644
--- a/abs/systemd/parabola.conf
+++ b/abs/systemd-not/parabola.conf
diff --git a/abs/systemd/splash-parabola.bmp b/abs/systemd-not/splash-parabola.bmp
index 471ac8e..471ac8e 100644
--- a/abs/systemd/splash-parabola.bmp
+++ b/abs/systemd-not/splash-parabola.bmp
diff --git a/abs/systemd-not/systemd-binfmt.hook b/abs/systemd-not/systemd-binfmt.hook
new file mode 100644
index 0000000..9c31a4b
--- /dev/null
+++ b/abs/systemd-not/systemd-binfmt.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/binfmt.d/*.conf
+
+[Action]
+Description = Registering binary formats...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
diff --git a/abs/systemd-not/systemd-catalog.hook b/abs/systemd-not/systemd-catalog.hook
new file mode 100644
index 0000000..d28bddc
--- /dev/null
+++ b/abs/systemd-not/systemd-catalog.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/catalog/*
+
+[Action]
+Description = Updating journal message catalog...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook catalog
diff --git a/abs/systemd-not/systemd-daemon-reload.hook b/abs/systemd-not/systemd-daemon-reload.hook
new file mode 100644
index 0000000..87923e8
--- /dev/null
+++ b/abs/systemd-not/systemd-daemon-reload.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/system/*
+
+[Action]
+Description = Reloading system manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
diff --git a/abs/systemd-not/systemd-hook b/abs/systemd-not/systemd-hook
new file mode 100644
index 0000000..793a429
--- /dev/null
+++ b/abs/systemd-not/systemd-hook
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+systemd_live() {
+  if [ ! -d /run/systemd/system ]; then
+    echo >&2 "  Skipped: Current root is not booted."
+    exit 0
+  fi
+}
+
+case $1 in
+  catalog)  /usr/bin/journalctl --update-catalog ;;
+  update)   touch -c /usr ;;
+  sysusers) /usr/bin/systemd-sysusers ;;
+  tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
+
+  daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
+  binfmt)        systemd_live; /usr/lib/systemd/systemd-binfmt ;;
+  sysctl)        systemd_live; /usr/lib/systemd/systemd-sysctl ;;
+
+  *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;
+esac
+
+exit 0
diff --git a/abs/systemd/systemd-hwdb.hook b/abs/systemd-not/systemd-hwdb.hook
index ec5bcfb..ec5bcfb 100644
--- a/abs/systemd/systemd-hwdb.hook
+++ b/abs/systemd-not/systemd-hwdb.hook
diff --git a/abs/systemd-not/systemd-sysctl.hook b/abs/systemd-not/systemd-sysctl.hook
new file mode 100644
index 0000000..aec5ac1
--- /dev/null
+++ b/abs/systemd-not/systemd-sysctl.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysctl.d/*.conf
+
+[Action]
+Description = Applying kernel sysctl settings...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
diff --git a/abs/systemd/systemd-sysusers.hook b/abs/systemd-not/systemd-sysusers.hook
index 9873dd4..9873dd4 100644
--- a/abs/systemd/systemd-sysusers.hook
+++ b/abs/systemd-not/systemd-sysusers.hook
diff --git a/abs/systemd/systemd-tmpfiles.hook b/abs/systemd-not/systemd-tmpfiles.hook
index df60d82..df60d82 100644
--- a/abs/systemd/systemd-tmpfiles.hook
+++ b/abs/systemd-not/systemd-tmpfiles.hook
diff --git a/abs/systemd-not/systemd-udev-reload.hook b/abs/systemd-not/systemd-udev-reload.hook
new file mode 100644
index 0000000..418515d
--- /dev/null
+++ b/abs/systemd-not/systemd-udev-reload.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/rules.d/*
+
+[Action]
+Description = Reloading device manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/udev-hook udev-reload
diff --git a/abs/systemd/systemd-update.hook b/abs/systemd-not/systemd-update.hook
index 7084a0c..7084a0c 100644
--- a/abs/systemd/systemd-update.hook
+++ b/abs/systemd-not/systemd-update.hook
diff --git a/abs/systemd/systemd-user.pam b/abs/systemd-not/systemd-user.pam
index 83f7626..83f7626 100644
--- a/abs/systemd/systemd-user.pam
+++ b/abs/systemd-not/systemd-user.pam
diff --git a/abs/systemd/systemd.install b/abs/systemd-not/systemd.install
index fedc747..fedc747 100644
--- a/abs/systemd/systemd.install
+++ b/abs/systemd-not/systemd.install
diff --git a/abs/systemd-not/udev-hook b/abs/systemd-not/udev-hook
new file mode 100644
index 0000000..61d8532
--- /dev/null
+++ b/abs/systemd-not/udev-hook
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+udevd_live() {
+  if [ ! -d /run/udev ]; then
+    echo >&2 "  Skipped: Device manager is not running."
+    exit 0
+  fi
+}
+
+case $1 in
+  hwdb)     /usr/bin/systemd-hwdb --usr update ;;
+
+  udev-reload)   udevd_live;   /usr/bin/udevadm control --reload ;;
+
+  *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;
+esac
+
+exit 0
diff --git a/abs/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/abs/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
deleted file mode 100644
index b0e9232..0000000
--- a/abs/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:19:20 -0400
-Subject: [PATCH 1/7] 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/journald.conf.xml            | 2 +-
- man/machinectl.xml               | 2 +-
- man/sd-bus-errors.xml            | 2 +-
- man/sd-login.xml                 | 2 +-
- man/sd_bus_error_add_map.xml     | 2 +-
- man/sd_uid_get_state.xml         | 2 +-
- man/systemd-detect-virt.xml      | 4 ++--
- man/systemd-machine-id-setup.xml | 2 +-
- man/systemd-resolved.service.xml | 6 +++---
- man/systemd.exec.xml             | 2 +-
- man/systemd.socket.xml           | 2 +-
- man/systemd.xml                  | 6 +++---
- 13 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/man/daemon.xml b/man/daemon.xml
-index 36c7c09db1..730507ed7e 100644
---- a/man/daemon.xml
-+++ b/man/daemon.xml
-@@ -144,7 +144,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>
- 
-@@ -285,7 +285,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/journald.conf.xml b/man/journald.conf.xml
-index ee8e8b7faf..28324ac102 100644
---- a/man/journald.conf.xml
-+++ b/man/journald.conf.xml
-@@ -111,7 +111,7 @@
-         <term><varname>SplitMode=</varname></term>
- 
-         <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
--        <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
-+        <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access
-         control is managed per file, and the journal daemon will assign users read access to their journal files. If
-         <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to
-         the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are
-diff --git a/man/machinectl.xml b/man/machinectl.xml
-index affca1dec1..278ca8d677 100644
---- a/man/machinectl.xml
-+++ b/man/machinectl.xml
-@@ -867,7 +867,7 @@
-     <para>The <command>machinectl</command> tool operates on machines
-     and images whose names must be chosen following strict
-     rules. Machine names must be suitable for use as host names
--    following a conservative subset of DNS and UNIX/Linux
-+    following a conservative subset of DNS and GNU/Linux
-     semantics. Specifically, they must consist of one or more
-     non-empty label strings, separated by dots. No leading or trailing
-     dots are allowed. No sequences of multiple dots are allowed. The
-diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
-index c834bde292..fdd2261fe9 100644
---- a/man/sd-bus-errors.xml
-+++ b/man/sd-bus-errors.xml
-@@ -102,7 +102,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-login.xml b/man/sd-login.xml
-index 83ef0b7307..93fd9ea782 100644
---- a/man/sd-login.xml
-+++ b/man/sd-login.xml
-@@ -244,7 +244,7 @@
- 
-     <para>
-       <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>
--      for an introduction to multi-seat support on Linux and the background for this set of APIs.
-+      for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.
-     </para>
-   </refsect1>
- 
-diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
-index 3eacbab660..b4b3b1bd17 100644
---- a/man/sd_bus_error_add_map.xml
-+++ b/man/sd_bus_error_add_map.xml
-@@ -58,7 +58,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/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
-index 02670e1bce..6f4ff77130 100644
---- a/man/sd_uid_get_state.xml
-+++ b/man/sd_uid_get_state.xml
-@@ -174,7 +174,7 @@
-         <listitem><para>An input parameter was invalid (out of range,
-         or NULL, where that is not accepted). This is also returned if
-         the passed user ID is 0xFFFF or 0xFFFFFFFF, which are
--        undefined on Linux.</para></listitem>
-+        undefined on GNU/Linux.</para></listitem>
-       </varlistentry>
- 
-       <varlistentry>
-diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
-index c4763fd561..54bba23666 100644
---- a/man/systemd-detect-virt.xml
-+++ b/man/systemd-detect-virt.xml
-@@ -133,12 +133,12 @@
- 
-           <row>
-             <entry><varname>lxc</varname></entry>
--            <entry>Linux container implementation by LXC</entry>
-+            <entry>Container implementation by LXC</entry>
-           </row>
- 
-           <row>
-             <entry><varname>lxc-libvirt</varname></entry>
--            <entry>Linux container implementation by libvirt</entry>
-+            <entry>Container implementation by libvirt</entry>
-           </row>
- 
-           <row>
-diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index 9e84fd8ccb..7f0dcd14d7 100644
---- a/man/systemd-machine-id-setup.xml
-+++ b/man/systemd-machine-id-setup.xml
-@@ -58,7 +58,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 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 --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
-index c895adaaf3..d2dc0538ca 100644
---- a/man/systemd-resolved.service.xml
-+++ b/man/systemd-resolved.service.xml
-@@ -47,7 +47,7 @@
-       <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined
-       by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,
-       including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
--      API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC
-+      API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC
-       validation status information however, and is synchronous only. This API is backed by the glibc Name Service
-       Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the
-       glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-@@ -153,7 +153,7 @@
- 
-     <itemizedlist>
-       <listitem><para><command>systemd-resolved</command> maintains the
--      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux
-+      <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux
-       programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53
-       DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by
-       systemd-resolved. The list of search domains is always kept up-to-date. Note that
-@@ -169,7 +169,7 @@
-       <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
- 
-       <listitem><para><command>systemd-resolved</command> maintains the
--      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux
-+      <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux
-       programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date,
-       containing information about all known DNS servers. Note the file format's limitations: it does not know a
-       concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that
-diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 3bd790b485..a532b74a6e 100644
---- a/man/systemd.exec.xml
-+++ b/man/systemd.exec.xml
-@@ -191,7 +191,7 @@
-         which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted
-         as first character). The user/group name must have at least one character, and at most 31. These restrictions
-         are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
--        Linux systems.</para>
-+        GNU/Linux systems.</para>
- 
-         <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
-         dynamically allocated at the time the service is started, and released at the time the service is stopped —
-diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 19c2ca9907..5fd6c1598f 100644
---- a/man/systemd.socket.xml
-+++ b/man/systemd.socket.xml
-@@ -280,7 +280,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 --git a/man/systemd.xml b/man/systemd.xml
-index 17ab59beb5..89086558c7 100644
---- a/man/systemd.xml
-+++ b/man/systemd.xml
-@@ -40,7 +40,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>
-@@ -888,10 +888,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
-     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 a container,
-     these arguments are parsed from <filename>/proc/cmdline</filename>
-     instead.</para></footnote>:</para>
- 
--- 
-2.18.0
-
diff --git a/abs/systemd/0001-Use-Arch-Linux-device-access-groups.patch b/abs/systemd/0001-Use-Arch-Linux-device-access-groups.patch
deleted file mode 100644
index c511144..0000000
--- a/abs/systemd/0001-Use-Arch-Linux-device-access-groups.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001
-Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 6 Mar 2018 23:39:47 +0100
-Subject: [PATCH] Use Arch Linux' device access groups
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-  cdrom   → optical
-  dialout → uucp
-  tape    → storage
----
- rules/50-udev-default.rules.in | 14 +++++++-------
- sysusers.d/basic.conf.in       |  6 +++---
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in
-index 191f56f42..f81c4d0fc 100644
---- a/rules/50-udev-default.rules.in
-+++ b/rules/50-udev-default.rules.in
-@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
- 
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
- 
-@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
- 
- SUBSYSTEM=="block", GROUP="disk"
--SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
--SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
--KERNEL=="sch[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
-+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
-+KERNEL=="sch[0-9]*", GROUP="optical"
-+KERNEL=="pktcdvd[0-9]*", GROUP="optical"
-+KERNEL=="pktcdvd", GROUP="optical"
- 
--SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
-+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
- SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
- KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
- KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
-diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
-index 8e358c02d..33e513a36 100644
---- a/sysusers.d/basic.conf.in
-+++ b/sysusers.d/basic.conf.in
-@@ -24,14 +24,14 @@ g utmp    -     -            -
- 
- # Hardware access groups
- g audio   -     -            -
--g cdrom   -     -            -
--g dialout -     -            -
- g disk    -     -            -
- g input   -     -            -
- g kvm     -     -            -
- g lp      -     -            -
-+g optical -     -            -
- g render  -     -            -
--g tape    -     -            -
-+g storage -     -            -
-+g uucp    -     -            -
- g video   -     -            -
- 
- # Default group for normal users
--- 
-2.16.2
-
diff --git a/abs/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/abs/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
deleted file mode 100644
index 1f49c9e..0000000
--- a/abs/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:23:40 -0400
-Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
- instead of "Linux"
-
----
- man/kernel-install.xml                    | 2 +-
- man/os-release.xml                        | 2 +-
- src/analyze/analyze.c                     | 2 +-
- src/core/main.c                           | 4 ++--
- src/firstboot/firstboot.c                 | 2 +-
- src/kernel-install/90-loaderentry.install | 2 +-
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index cd9756662a..9ead6ea39b 100644
---- a/man/kernel-install.xml
-+++ b/man/kernel-install.xml
-@@ -88,7 +88,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 a51edf3b8a..9ff4b7e8c2 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -187,7 +187,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 de0fe6eba8..9f239c8eeb 100644
---- a/src/analyze/analyze.c
-+++ b/src/analyze/analyze.c
-@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {
-         svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
-         if (use_full_bus)
-                 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 44dd8348be..9a4fc26425 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1234,11 +1234,11 @@ 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);
-         else
-                 return status_printf(NULL, false, false,
-                                      "\nWelcome to %s!\n",
--                                     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 a98e53b3a3..41b212e32d 100644
---- a/src/firstboot/firstboot.c
-+++ b/src/firstboot/firstboot.c
-@@ -87,7 +87,7 @@ static void print_welcome(void) {
-                                "Failed to read os-release file, ignoring: %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 a271cdb8a0..29047ccbff 100644
---- a/src/kernel-install/90-loaderentry.install
-+++ b/src/kernel-install/90-loaderentry.install
-@@ -40,7 +40,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.18.0
-
diff --git a/abs/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/abs/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
deleted file mode 100644
index 401d284..0000000
--- a/abs/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a6be5d2b2cd02f302ef70c76b601e7af912c3022 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:24:56 -0400
-Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "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 9ff4b7e8c2..1c069275c8 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -98,7 +98,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 9e77e314ff..3d0c3aafd7 100644
---- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -788,7 +788,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.18.0
-
diff --git a/abs/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/abs/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
deleted file mode 100644
index 58e157b..0000000
--- a/abs/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:28:30 -0400
-Subject: [PATCH 4/7] 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 1c069275c8..272258b4e1 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -122,7 +122,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.18.0
-
diff --git a/abs/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/abs/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
deleted file mode 100644
index 5e170ce..0000000
--- a/abs/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:31:20 -0400
-Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
- instead of "linux"
-
----
- src/resolve/resolved-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
-index 01372fc66b..9155ce5c2e 100644
---- a/src/resolve/resolved-manager.c
-+++ b/src/resolve/resolved-manager.c
-@@ -387,10 +387,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
- static const char *fallback_hostname(void) {
- 
-         /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be
--         * "localhost" even if that's the compiled in hostname. In this case, let's revert to "linux" instead. */
-+         * "localhost" even if that's the compiled in hostname. In this case, let's revert to "gnu-linux" instead. */
- 
-         if (is_localhost(FALLBACK_HOSTNAME))
--                return "linux";
-+                return "gnu-linux";
- 
-         return FALLBACK_HOSTNAME;
- }
--- 
-2.18.0
-
diff --git a/abs/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/abs/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
deleted file mode 100644
index 0905e6b..0000000
--- a/abs/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 35af892f1dffbb0daa9aa721f908f7c38b064ebe 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 | 50 +++++++++++++++++++++++-------------------
- 2 files changed, 52 insertions(+), 47 deletions(-)
-
-diff --git a/man/os-release.xml b/man/os-release.xml
-index 272258b4e1..6cea40cb99 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -99,7 +99,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>
- 
-@@ -110,8 +110,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>
-@@ -123,8 +123,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>
-@@ -145,9 +145,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>
-@@ -176,8 +176,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>
-@@ -188,8 +188,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>
-@@ -212,7 +212,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>
- 
-@@ -247,8 +247,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>
-@@ -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>
- 
-   <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 284c9b294b..7b3d211161 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 @@
-   <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
-       <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/&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 @@
-       <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>
-+      <title>Build and boot a minimal BLAG distribution in a container</title>
- 
--      <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-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-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>
-+      <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
-       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>
-+      <command>systemd-nspawn -M blag&blag_latest_version;</command>.</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 Ucclia distribution</title>
- 
--      <programlisting># debootstrap unstable ~/debian-tree/
--# systemd-nspawn -D ~/debian-tree/</programlisting>
-+      <programlisting># debootstrap ucclia ~/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>
- 
-       <para><command>debootstrap</command> supports
-@@ -1227,29 +1229,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
--# 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 distribution into the
-+      directory <filename>~/parabola-tree/</filename> and then boots an OS
-       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.18.0
-
diff --git a/abs/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/abs/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
deleted file mode 100644
index 0fe5def..0000000
--- a/abs/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 31e5d50f17d3993839d8f7c9f344a620e3871812 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Sat, 17 Dec 2016 00:56:43 -0500
-Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of
- "Linux Boot Manager"
-
----
- src/boot/bootctl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
-index 2832a39dd7..534870ee50 100644
---- a/src/boot/bootctl.c
-+++ b/src/boot/bootctl.c
-@@ -665,13 +665,13 @@ static int install_variables(const char *esp_path,
-                                        "Failed to determine current boot order: %m");
- 
-         if (first || r == 0) {
--                r = efi_add_boot_option(slot, "Linux Boot Manager",
-+                r = efi_add_boot_option(slot, "Systemd Boot Manager",
-                                         part, pstart, psize,
-                                         uuid, path);
-                 if (r < 0)
-                         return log_error_errno(r, "Failed to create EFI Boot variable entry: %m");
- 
--                log_info("Created EFI boot entry \"Linux Boot Manager\".");
-+                log_info("Created EFI boot entry \"Systemd Boot Manager\".");
-         }
- 
-         return insert_into_order(slot, first);
--- 
-2.18.0
-
diff --git a/write-ifchanged b/write-ifchanged
new file mode 100755
index 0000000..84dfd6e
--- /dev/null
+++ b/write-ifchanged
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Copyright (C) 2015  Luke Shumaker
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+outfile=$1
+tmpfile="$(dirname "$outfile")/.tmp.${outfile##*/}.tmp"
+
+cat > "$tmpfile" || exit $?
+if cmp -s "$tmpfile" "$outfile"; then
+        rm -f "$tmpfile" || :
+else
+        mv -f "$tmpfile" "$outfile"
+fi
author	Luke Shumaker <lukeshu@lukeshu.com>	2018-07-26 21:53:53 -0400
committer	Luke Shumaker <lukeshu@lukeshu.com>	2018-07-26 21:53:53 -0400
commit	149e145fccb6df9f629c9145ca857a7939230c25 (patch)
tree	530614eea927775a2d314f7cf263720b3bd11c20
parent	075a6e76f91325a4bfd9a1ee1dcea6d92b11cd2f (diff)