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

fw-client

@@ -1,4 +1,4 @@
-## Description: Firewall Configuration for nfs client.
+## Description: Firewall Configuration for NFS client.
 #
 # Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed.
 # More may be supported in the future.
@@ -8,7 +8,7 @@
 #
 
 ## Name: NFS Client
-## Description: opens ports for NFS client in order to allow to connect to a NFS server
+## Description: Opens ports for NFS client to allow connection to an NFS server.
 
 # space separated list of allowed TCP ports
 TCP=""

fw-server

@@ -1,4 +1,4 @@
-## Description: Firewall Configuration for nfs kernel server.
+## Description: Firewall Configuration for NFS kernel server.
 #
 # Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed.
 # More may be supported in the future.
@@ -8,7 +8,7 @@
 #
 
 ## Name: NFS Server Service
-## Description: opens ports for NFS in order to allow other hosts connect to it
+## Description: Opens ports for NFS to allow other hosts to connect.
 
 # space separated list of allowed TCP ports
 TCP=""

nfs-utils.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Sep 22 04:20:30 CEST 2008 - nfbrown@suse.de
+
+- Change nfs.init to do nothing if NFS is not mentioend in /etc/fstab,
+  and sure it is always enabled.  bnc#331667
+
+-------------------------------------------------------------------
+Mon Sep 22 02:50:41 CEST 2008 - nfbrown@suse.de
+
+- Improve Description fields in fw-server and fs-client.
+  bnc#424432 bnc#424433
+
+-------------------------------------------------------------------
+Tue Sep 16 18:24:18 CEST 2008 - mrueckert@suse.de
+
+- require libevent-devel on 11.1 or newer
+
 -------------------------------------------------------------------
 Wed Sep  3 11:09:34 CEST 2008 - hare@suse.de
 

nfs-utils.spec

@@ -18,11 +18,16 @@
 
 
 Name:           nfs-utils
-BuildRequires:  e2fsprogs-devel gcc-c++ krb5-devel libevent libgssglue-devel librpcsecgss nfsidmap-devel pkgconfig tcpd-devel
+BuildRequires:  e2fsprogs-devel gcc-c++ krb5-devel libgssglue-devel librpcsecgss nfsidmap-devel pkgconfig tcpd-devel
+%if 0%{?suse_version} > 1100
+BuildRequires:  libevent-devel
+%else
+BuildRequires:  libevent
+%endif
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.1.3
-Release:        2
+Release:        3
 Group:          Productivity/Networking/NFS
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -178,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -n nfs-client
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
-%{fillup_only -an nfs}
+%{fillup_and_insserv -Y -n nfs nfs}
 %run_permissions
 
 %preun -n nfs-client
@@ -276,6 +281,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
 
 %changelog
+* Mon Sep 22 2008 nfbrown@suse.de
+- Change nfs.init to do nothing if NFS is not mentioend in /etc/fstab,
+  and sure it is always enabled.  bnc#331667
+* Mon Sep 22 2008 nfbrown@suse.de
+- Improve Description fields in fw-server and fs-client.
+  bnc#424432 bnc#424433
+* Tue Sep 16 2008 mrueckert@suse.de
+- require libevent-devel on 11.1 or newer
 * Wed Sep 03 2008 hare@suse.de
 - Call mkinitrd_setup during %%post and %%postun (bnc#413709)
 * Mon Aug 18 2008 mrueckert@suse.de

nfs.init

@@ -93,7 +93,7 @@ if test -x /sbin/portmap ; then
     PORTMAP_BIN=/sbin/portmap
 elif test -x /sbin/rpcbind ; then
     PORTMAP_BIN=/sbin/rpcbind
-else
+elif test $nfs = yes ; then
     echo "portmap/rpcbind is missing"
     rc_failed 3
     rc_status -v
@@ -154,8 +154,21 @@ do_start_idmapd() {
 }
 
 rc_reset
-case "$1" in
+case "$1-$nfs" in
-    start|reload)
+    start-no|reload-no)
+	# Always run smnotify, even if no mounts are listed in fstab.
+	# If there is nothing to do, it will exit quickly, and if there
+	# is something to do, the sooner it is done, the better.
+	/usr/sbin/sm-notify $SM_NOTIFY_OPTIONS
+	echo -n "Not starting NFS client services - no NFS found in /etc/fstab:"
+	rc_status -u
+	;;
+    stop-no )
+	echo -n "Not stopping NFS client services:"
+	rc_status -u
+	;;
+	
+    start-yes|reload-yes)
 	echo -n "Starting NFS client services:"
 	if ! checkproc $PORTMAP_BIN ; then
 	    echo "portmap/rpcbind is not running"
@@ -214,7 +227,7 @@ case "$1" in
 	#
 	rc_status -v
 	;;
-    stop)
+    stop-yes)
 	echo -n "Shutting down NFS client services:"
 	#
 	# Unmount background because during long timeouts
@@ -254,14 +267,14 @@ case "$1" in
 	#
 	rc_status -v
 	;;
-    restart|force-reload)
+    restart*|force-reload*)
         ## Stop the service and regardless of whether it was
 	## running or not, start it again.
 	$0 stop
 	$0 start
 	rc_status
 	;;
-    status)
+    status*)
 	echo -n "Checking for mounted nfs shares (from /etc/fstab):"
 	if test "$nfs" = yes ; then
 	    rc_failed $status
@@ -283,7 +296,7 @@ case "$1" in
 	fi
         rc_status -v
 	;;
-    try-restart|condrestart)
+    try-restart*|condrestart*)
 	$0 status
 	if test $? -eq 0; then
 	    $0 restart