From 1d20511364397e41e131cd382cdf9f11ddceab10 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 4 Oct 2016 12:29:10 +0000
Subject: [PATCH] core/systemd to 231-3

---
 core/systemd/PKGBUILD                 | 9 +++++++--
 core/systemd/initcpio-install-systemd | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index be700498a..4c5f4e24b 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=231
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -26,7 +26,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'udev-hwdb.hook')
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
-         'bee7fd6ccda39582259708e3f262ea6d'
+         '55ea7d81c02d090b65c42a88f1a5a21a'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a'
@@ -34,6 +34,10 @@ md5sums=('SKIP'
          'a475a5ed8f03fb0f6b58b4684998d05c')
 
 _backports=(
+  '531ac2b2349da02acc9c382849758e07eb92b020'  # If the notification message length is 0, ignore the message
+  '8523bf7dd514a3a2c6114b7b8fb8f308b4f09fc4'  # pid1: process zero-length notification messages again
+  '9987750e7a4c62e0eb8473603150596ba7c3a015'  # pid1: don't return any error in manager_dispatch_notify_fd()
+  'bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d'  # Revert "pid1: reconnect to the console before being re-executed"
 )
 
 prepare() {
@@ -162,6 +166,7 @@ package_libsystemd() {
   license=('GPL2')
   provides=('libsystemd.so' 'libudev.so')
 
+  # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
   make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
 }
 
diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd
index b57661b3e..59c16b7ef 100644
--- a/core/systemd/initcpio-install-systemd
+++ b/core/systemd/initcpio-install-systemd
@@ -147,6 +147,7 @@ build() {
             systemd-journald.service \
             systemd-journald-audit.socket \
             systemd-journald-dev-log.socket \
+            systemd-modules-load.service \
             systemd-tmpfiles-setup-dev.service \
             systemd-udev-trigger.service \
             systemd-udevd-control.socket \
@@ -172,6 +173,13 @@ build() {
 ExecStart=
 ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
 EOF
+
+    add_dir "/etc/modules-load.d"
+    (
+      . "$_f_config"
+      set -f
+      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+    )
 }
 
 help() {