From 4edba7220e45fb05ae58d35373f6fa91fb8086836d6ddeee8d23f5d579cb300f Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Tue, 7 Dec 2010 17:45:00 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/nfs-utils
 revision 63.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=d53a352abc67447f34368d32408d357b
---
 nfs-utils.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 1bdfd0d..6c12e17 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -27,7 +27,7 @@ BuildRequires:  libevent
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.2.3
-Release:        1
+Release:        2
 Group:          Productivity/Networking/NFS
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

From ea7c44ade3343a849a472a2e58d6ab7e224e86ce93bf7fbdb858d80eed15a802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 14 Jan 2011 16:01:30 +0000
Subject: [PATCH 2/2] Accepting request 57970 from
 home:lnussel:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/57970
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=29
---
 nfs-utils.changes | 8 ++++++++
 nfs-utils.spec    | 2 +-
 nfs.init          | 8 +++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index 385bd69..bfd0b52 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 12 12:15:31 UTC 2011 - lnussel@suse.de
+
+- don't enable nfs init script by default. The yast nfs module
+  makes sure the script gets enabled when adding mounts
+- print a message to tell when file systems are mounted as that
+  could take a while
+
 -------------------------------------------------------------------
 Tue Dec  7 11:18:24 UTC 2010 - coolo@novell.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6c12e17..9f0c8c9 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -202,7 +202,7 @@ useradd -r -c 'NFS statd daemon' \
 chown statd:nogroup /var/lib/nfs
 chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || :
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
-%{fillup_and_insserv -Y -n nfs nfs}
+%{fillup_and_insserv -n nfs nfs}
 %run_permissions
 
 %preun -n nfs-client
diff --git a/nfs.init b/nfs.init
index a1c851f..6e0871b 100644
--- a/nfs.init
+++ b/nfs.init
@@ -216,6 +216,7 @@ case "$1-$nfs" in
             echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE
 	fi
 
+	rc_status -v
 	# remark: statd is started when needed by mount.nfs
 
 	# Mount all auto NFS devices (-> nfs(5) and mount(8) )
@@ -234,18 +235,19 @@ case "$1-$nfs" in
 	    # We cannot try the mount and on failure: 'settle' and try again
 	    # as if there are 'bg' mounts, we could get multiple copies
 	    # of them.  So always 'settle' if there is any mounting to do.
+	    echo -n "Mounting network file systems ..."
 	    udevadm settle
-            mount -at nfs,nfs4 > /dev/null 2>&1
+            mount -at nfs,nfs4 || rc_failed 1
+	    rc_status -v
 	fi
 	#
     	# generate new list of available shared libraries
 	#
 	if test "$NEED_LDCONFIG" = yes; then
 	    # check if ld.so.cache needs to be refreshed
-	    /etc/init.d/boot.ldconfig start > /dev/null 2>&1
+	    /etc/init.d/boot.ldconfig start
 	fi
 	#
-	rc_status -v
 	;;
     stop* )
 	echo -n "Shutting down NFS client services:"