OBS User unknown 2008-09-26 13:05:25 +00:00 committed by Git OBS Bridge
parent 2b4f8de9e4
commit e3ed016202
3 changed files with 27 additions and 9 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Mon Sep 22 04:20:30 CEST 2008 - nfbrown@suse.de

View File

@ -27,7 +27,7 @@ BuildRequires: libevent
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 @@ rm -rf $RPM_BUILD_ROOT
%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

View File

@ -89,11 +89,16 @@ if test "$NFS4_SUPPORT" = yes ; then
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 @@ case "$1-$nfs" in
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 @@ case "$1-$nfs" in
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
;;