OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=37

nfs-utils.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 13 17:58:34 CEST 2008 - mkoenig@suse.de
+
+- nfs.init: 
+  * ensure all daemons get killed on stop (including rpc.statd)
+  * unmount rpc_pipefs 
+  * let close_usr do the work before the NFS filesystems get unmounted
+
 -------------------------------------------------------------------
 Mon Oct 13 10:35:13 CEST 2008 - ro@suse.de
 

nfs-utils.spec

@@ -27,7 +27,7 @@ BuildRequires:  libevent
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.1.3
-Release:        7
+Release:        8
 Group:          Productivity/Networking/NFS
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -281,6 +281,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
 
 %changelog
+* Mon Oct 13 2008 mkoenig@suse.de
+- nfs.init:
+  * ensure all daemons get killed on stop (including rpc.statd)
+  * unmount rpc_pipefs
+  * let close_usr do the work before the NFS filesystems get unmounted
 * Mon Oct 13 2008 ro@suse.de
 - fix sysconfig filename for changed fillup call
 * Mon Oct 06 2008 kukuk@suse.de

nfs.init

@@ -26,6 +26,7 @@
 
 IDMAPD_BIN=/usr/sbin/rpc.idmapd
 GSSD_BIN=/usr/sbin/rpc.gssd
+STATD_BIN=/usr/sbin/rpc.statd
 
 IDMAPD_CLIENT_STATE=/var/lock/subsys/nfs-rpc.idmapd
 IDMAPD_SERVER_STATE=/var/lock/subsys/nfsserver-rpc.idmapd
@@ -114,6 +115,14 @@ mount_rpc_pipefs() {
     mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
 }
 
+umount_rpc_pipefs() {
+    # See if the file system is there
+    case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs` in
+    *67596969*)
+        umount /var/lib/nfs/rpc_pipefs
+    esac
+}
+
 mount_usr() {
     test -n "$usr" -o -n "$opt" || return
     local where
@@ -234,6 +243,13 @@ case "$1-$nfs" in
 	;;
     stop-yes)
 	echo -n "Shutting down NFS client services:"
+
+	# in case we have /usr and/or /opt via nfs terminate all
+	# processes on them (nfsservers shouldn't do /usr via nfs)
+	case "$RUNLEVEL" in
+	[016sS]) close_usr ;;
+	esac
+
 	#
 	# Unmount background because during long timeouts
 	#
@@ -244,10 +260,7 @@ case "$1-$nfs" in
 	# stop gssd
 	if test "$NEED_GSSD" = yes ; then
 	    echo -n " gssd"
-	    killproc $GSSD_BIN || {
+	    killproc $GSSD_BIN
-	        rc_status -v
-	        rc_exit
-	    }
 	fi
 
 	# stop idmapd
@@ -255,19 +268,18 @@ case "$1-$nfs" in
 	    # only stop idmapd if it is not needed by server
 	    if test ! -f $IDMAPD_SERVER_STATE ; then
 	        echo -n " idmapd"
-	        killproc $IDMAPD_BIN || {
+	        killproc $IDMAPD_BIN
-	            rc_status -v
-	            rc_exit
-	        }
 	    fi
 	    rm -f $IDMAPD_CLIENT_STATE
 	fi 
 
-	# in case we have /usr and/or /opt via nfs terminate all
+	# stop rpc.statd
-	# processes on them (nfsservers shouldn't do /usr via nfs)
+	if checkproc $STATD_BIN ; then
-	case "$RUNLEVEL" in
+	    echo -n " rpc.statd"
-	[016sS]) close_usr ;;
+	    killproc $STATD_BIN
-	esac
+	fi
+
+	umount_rpc_pipefs
 
 	#
 	rc_status -v