better ypbind.service

3 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afb5ffd3688f..4b1f1dccfac3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ypbind-mt
 	pkgdesc = Linux NIS daemon
 	pkgver = 2.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/thkukuk/ypbind-mt
 	arch = i686
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = ypbind-mt
 	source = ypbind.conf
 	source = fixes.patch
 	md5sums = 11f09789cc8bb4d844798c3535c30208
-	md5sums = 5ea205756731c2978cca4934141424bd
+	md5sums = 50e05f057ec0603243e3d334aaa0934f
 	md5sums = 3d6a8eb44771f81abb47d14d9e4f301d
 	md5sums = 17374b15cfa85bae36ee1948600821e6
 
diff --git a/PKGBUILD b/PKGBUILD
index f64a124828ef..77b230362532 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=ypbind-mt
 pkgver=2.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux NIS daemon'
 url='https://github.com/thkukuk/ypbind-mt'
 license=('GPL2')
@@ -41,6 +41,6 @@ package() {
 }
 
 md5sums=('11f09789cc8bb4d844798c3535c30208'
-         '5ea205756731c2978cca4934141424bd'
+         '50e05f057ec0603243e3d334aaa0934f'
          '3d6a8eb44771f81abb47d14d9e4f301d'
          '17374b15cfa85bae36ee1948600821e6')
diff --git a/ypbind.service b/ypbind.service
index bb13f1d66560..0556e256c8e2 100644
--- a/ypbind.service
+++ b/ypbind.service
@@ -3,6 +3,7 @@ Description=YP Bind
 Requires=rpcbind.service domainname.service
 After=rpcbind.service domainname.service network.target
 Before=systemd-user-sessions.service
+Before=nss-user-lookup.target
 
 [Service]
 Type=forking
@@ -10,7 +11,7 @@ PIDFile=/run/ypbind.pid
 ExecStart=/usr/bin/ypbind
 # Terrible hack, upstream ypbind should sort something out
 # Wait for at most 10 seconds for a NIS master to become available
-ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done"
+ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich >/dev/null && break; sleep 1; done"
 
 [Install]
 WantedBy=multi-user.target