[arch-commits] Commit in shadow/trunk (PKGBUILD shadow.service)

[Dave Reisner]

    Date: Saturday, October 29, 2016 @ 15:58:41
  Author: dreisner
Revision: 279437

upgpkg: shadow 4.4-3

- Avoid blocking bootup with shadow.service (FS#48245)

Modified:
  shadow/trunk/PKGBUILD
  shadow/trunk/shadow.service

----------------+
 PKGBUILD       |    8 ++++----
 shadow.service |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-29 15:58:12 UTC (rev 279436)
+++ PKGBUILD	2016-10-29 15:58:41 UTC (rev 279437)
@@ -4,7 +4,7 @@
 
 pkgname=shadow
 pkgver=4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64')
 url='https://github.com/shadow-maint/shadow'
@@ -42,7 +42,7 @@
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
           'a154a94b47a3d0c6c287253b98c0d10b861226d0'
-          'e40fc20894e69a07fb0070b41f567d0c27133720'
+          '7372dfd8a3030bee4ec39c79bad4f9b9c6f8687a'
           '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
           '6010fffeed1fc6673ad9875492e1193b1a847b53'
           '21e12966a6befb25ec123b403cd9b5c492fe5b16'
@@ -103,8 +103,8 @@
   # systemd timer
   install -D -m644 "$srcdir/shadow.timer" "$pkgdir/usr/lib/systemd/system/shadow.timer"
   install -D -m644 "$srcdir/shadow.service" $pkgdir/usr/lib/systemd/system/shadow.service
-  install -d -m755 "$pkgdir/usr/lib/systemd/system/multi-user.target.wants"
-  ln -s ../shadow.timer "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/shadow.timer"
+  install -d -m755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
+  ln -s ../shadow.timer "$pkgdir/usr/lib/systemd/system/timers.target.wants/shadow.timer"
 
   # login.defs
   install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"

Modified: shadow.service
===================================================================
--- shadow.service	2016-10-29 15:58:12 UTC (rev 279436)
+++ shadow.service	2016-10-29 15:58:41 UTC (rev 279437)
@@ -1,10 +1,10 @@
 [Unit]
 Description=Verify integrity of password and group files
+After=systemd-sysusers.service
 
 [Service]
-Type=oneshot
-ExecStart=/usr/bin/pwck -r
-ExecStart=/usr/bin/grpck -r
+Type=simple
+ExecStart=/bin/sh -c '/usr/bin/pwck -r ; /usr/bin/grpck -r'
 Nice=19
 IOSchedulingClass=best-effort
 IOSchedulingPriority=7