Hello community, here is the log from the commit of package nfs-utils checked in at Fri Sep 26 15:05:24 CEST 2008. -------- --- nfs-utils/nfs-utils.changes 2008-09-22 04:21:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes 2008-09-26 04:02:58.741892000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 26 04:01:46 CEST 2008 - nfbrown@suse.de + +- Fix nfs.init to check for portmap or rpcbind properly. + Either or both can be installed, but as long as one is + running, neither 'start' or 'status' will complain. + bnc#428436 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.Lf3211/_old 2008-09-26 15:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Lf3211/_new 2008-09-26 15:03:25.000000000 +0200 @@ -27,7 +27,7 @@ Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.1.3 -Release: 3 +Release: 4 Group: Productivity/Networking/NFS License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -281,6 +281,11 @@ %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4 %changelog +* Fri Sep 26 2008 nfbrown@suse.de +- Fix nfs.init to check for portmap or rpcbind properly. + Either or both can be installed, but as long as one is + running, neither 'start' or 'status' will complain. + bnc#428436 * 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 ++++++ nfs.init ++++++ --- nfs-utils/nfs.init 2008-09-22 04:20:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs.init 2008-09-26 04:01:15.119610000 +0200 @@ -89,11 +89,16 @@ NEED_IDMAPD=yes fi -if test -x /sbin/portmap ; then - PORTMAP_BIN=/sbin/portmap -elif test -x /sbin/rpcbind ; then - PORTMAP_BIN=/sbin/rpcbind -elif test $nfs = yes ; then +check_portmap() { + # check if either portmap or rpcbind is running + if test -x /sbin/portmap && checkproc /sbin/portmap + then true + elif test -x /sbin/rpcbind && checkproc /sbin/rpcbind + then true + else false + fi +} +if ! test $nfs = no -o -x /sbin/portmap -o -x /sbin/rpcbind; then echo "portmap/rpcbind is missing" rc_failed 3 rc_status -v @@ -170,7 +175,7 @@ start-yes|reload-yes) echo -n "Starting NFS client services:" - if ! checkproc $PORTMAP_BIN ; then + if ! check_portmap ; then echo "portmap/rpcbind is not running" rc_failed 3 rc_status -v @@ -291,8 +296,8 @@ echo "idmapd not running" rc_failed 3 fi - if ! checkproc /sbin/portmap; then - echo "Warning: portmap not running - nfs may not work well" + if ! check_portmap; then + echo "Warning: portmap/rpcbind not running - nfs may not work well" fi rc_status -v ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org