[arch-commits] Commit in nfs-utils/trunk (PKGBUILD nfs-common nfs-server)

[Tobias Powalowski]

    Date: Friday, August 26, 2011 @ 10:41:43
  Author: tpowa
Revision: 136331

upgpkg: nfs-utils 1.2.4-3

fix #20903 not starting daemons from rc scripts

Modified:
  nfs-utils/trunk/PKGBUILD
  nfs-utils/trunk/nfs-common
  nfs-utils/trunk/nfs-server

------------+
 PKGBUILD   |    6 +++---
 nfs-common |    6 +-----
 nfs-server |    6 +-----
 3 files changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-26 13:04:19 UTC (rev 136330)
+++ PKGBUILD	2011-08-26 14:41:43 UTC (rev 136331)
@@ -7,7 +7,7 @@
 
 pkgname=nfs-utils
 pkgver=1.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -28,9 +28,9 @@
         kernel-3.0-segfault.patch)
 install=nfs-utils.install
 md5sums=('938dc0574f3eb9891a8ed4746f806277'
-         'fc508e10cdf5e8ddd80373b1b2bc99a1'
+         'dd0d65fc6e8f422fa12520813098264b'
          'f73f197a16b02c3e248488ec35c4cf43'
-         '5ae080f6117cef3140f02bc162bdc755'
+         'e619f18354ff958ed624d05d08853d8f'
          '2bf71def3263325643a09458635520f0'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'

Modified: nfs-common
===================================================================
--- nfs-common	2011-08-26 13:04:19 UTC (rev 136330)
+++ nfs-common	2011-08-26 14:41:43 UTC (rev 136331)
@@ -2,9 +2,6 @@
 
 daemon_name=nfs-common
 
-# daemon dependencies
-DAEMON_DEPENDS=('rpcbind')
-
 NEED_STATD=
 STATD_OPTS=
 NEED_IDMAPD=
@@ -124,8 +121,7 @@
 
 case "$1" in
   start)
-    ck_depends ${DAEMON_DEPENDS[@]}
-
+    ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
     rc=0
     if [ "$NEED_STATD" = yes ]; then
       stat_busy "Starting $STATD_DAEMON_NAME daemon"

Modified: nfs-server
===================================================================
--- nfs-server	2011-08-26 13:04:19 UTC (rev 136330)
+++ nfs-server	2011-08-26 14:41:43 UTC (rev 136331)
@@ -2,9 +2,6 @@
 
 daemon_name=nfs-server
 
-# daemon dependencies
-DAEMON_DEPENDS=('nfs-common')
-
 NFSD_COUNT=
 NFSD_OPTS=
 NEED_SVCGSSD=
@@ -85,8 +82,7 @@
 
 case "$1" in
   start)
-    ck_depends ${DAEMON_DEPENDS[@]}
-
+    ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
     rc=0
     stat_busy "Mounting nfsd filesystem"
     do_modprobe nfsd