Thu Jun 12 03:35:06 UTC 2014

1 files changed, 23 insertions, 9 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 78ca21668..1e67f5839 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=6
+pkgrel=9
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -18,14 +18,20 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-install-udev'
         '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
         '0001-fsck-disable-l-option-for-now.patch'
-        '0001-networkd-link-intialize-mac-address.patch')
+        '0001-udev-exclude-device-mapper-from-block-device-ownersh.patch'
+        '0001-udev-always-close-lock-file-descriptor.patch'
+        '0001-networkd-link-intialize-mac-address.patch'
+        '0001-udev-really-exclude-device-mapper-from-block-device-.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
          'bde43090d4ac0ef048e3eaee8202a407'
          '5f8ad7126970855614c7fa34b317728d'
          '888cf85a92dd28bcf80e18539fef3915'
-         '3d53d3bcd85ca0b2ff9f4e79d012808d')
+         'f26803dda8811196c0564f928bfe69d1'
+         '2a14fe9876fa48f01cca3c1d575e5771'
+         '3d53d3bcd85ca0b2ff9f4e79d012808d'
+         'ae060fc00eeced6554e70d9a9c0eb42f')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -33,8 +39,12 @@ prepare() {
   patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch"
   patch -Np1 <"$srcdir/0001-networkd-link-intialize-mac-address.patch"
   patch -Np1 <"$srcdir/0001-fsck-disable-l-option-for-now.patch"
+  patch -Np1 <"$srcdir/0001-udev-always-close-lock-file-descriptor.patch"
+  patch -Np1 <"$srcdir/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch"
+  patch -Np1 <"$srcdir/0001-udev-really-exclude-device-mapper-from-block-device-.patch"
 }
 
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -81,18 +91,22 @@ package_systemd() {
           etc/systemd/journald.conf
           etc/systemd/logind.conf
           etc/systemd/system.conf
+          etc/systemd/timesyncd.conf
+          etc/systemd/resolved.conf
           etc/systemd/user.conf
           etc/udev/udev.conf)
   install="systemd.install"
 
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
-  # don't write units to /etc by default -- we'll enable the getty on
-  # post_install as a sane default.
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rm "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service"
-  rm "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-resolved.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
+  # don't write units to /etc by default. some of these will be re-enabled on
+  # post_install.
+  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" \
+      "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service" \
+      "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-resolved.service" \
+      "$pkgdir/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service"
+  rmdir "$pkgdir/etc/systemd/system/getty.target.wants" \
+      "$pkgdir/etc/systemd/system/network-online.target.wants"
 
   # get rid of RPM macros
   rm -r "$pkgdir/usr/lib/rpm"