[arch-commits] Commit in systemd/trunk (PKGBUILD systemd.install)

[Christian Hesse]

    Date: Thursday, July 6, 2017 @ 13:32:24
  Author: eworm
Revision: 299758

upgpkg: systemd 233.75-3

* fix man pages
* include changes from SVN

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------+
 PKGBUILD        |    4 ++--
 systemd.install |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-06 11:27:57 UTC (rev 299757)
+++ PKGBUILD	2017-07-06 13:32:24 UTC (rev 299758)
@@ -10,7 +10,7 @@
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
 pkgver=233.75
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="https://www.github.com/systemd/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -195,7 +195,7 @@
   # 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 -r "$pkgdir/etc/systemd/"*.service
+  rm -r "$pkgdir/etc/systemd/system/"*.service
 
   # add back tmpfiles.d/legacy.conf
   install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"

Modified: systemd.install
===================================================================
--- systemd.install	2017-07-06 11:27:57 UTC (rev 299757)
+++ systemd.install	2017-07-06 13:32:24 UTC (rev 299758)
@@ -49,7 +49,7 @@
   # upstream installs services to /etc, which we remove
   # to keep bus activation we re-enable systemd-resolved
   if systemctl is-enabled -q systemd-resolved.service; then
-    systemctl reenable -q systemd-resolved.service
+    systemctl reenable systemd-resolved.service 2>/dev/null
   fi
 }