forked from pool/nfs-utils
This commit is contained in:
parent
2b4f8de9e4
commit
e3ed016202
@ -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
|
Mon Sep 22 04:20:30 CEST 2008 - nfbrown@suse.de
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ BuildRequires: libevent
|
|||||||
Url: http://nfs.sourceforge.net
|
Url: http://nfs.sourceforge.net
|
||||||
Summary: Support Utilities for Kernel nfsd
|
Summary: Support Utilities for Kernel nfsd
|
||||||
Version: 1.1.3
|
Version: 1.1.3
|
||||||
Release: 3
|
Release: 4
|
||||||
Group: Productivity/Networking/NFS
|
Group: Productivity/Networking/NFS
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -281,6 +281,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
|
%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Sep 22 2008 nfbrown@suse.de
|
||||||
- Change nfs.init to do nothing if NFS is not mentioend in /etc/fstab,
|
- Change nfs.init to do nothing if NFS is not mentioend in /etc/fstab,
|
||||||
and sure it is always enabled. bnc#331667
|
and sure it is always enabled. bnc#331667
|
||||||
|
21
nfs.init
21
nfs.init
@ -89,11 +89,16 @@ if test "$NFS4_SUPPORT" = yes ; then
|
|||||||
NEED_IDMAPD=yes
|
NEED_IDMAPD=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -x /sbin/portmap ; then
|
check_portmap() {
|
||||||
PORTMAP_BIN=/sbin/portmap
|
# check if either portmap or rpcbind is running
|
||||||
elif test -x /sbin/rpcbind ; then
|
if test -x /sbin/portmap && checkproc /sbin/portmap
|
||||||
PORTMAP_BIN=/sbin/rpcbind
|
then true
|
||||||
elif test $nfs = yes ; then
|
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"
|
echo "portmap/rpcbind is missing"
|
||||||
rc_failed 3
|
rc_failed 3
|
||||||
rc_status -v
|
rc_status -v
|
||||||
@ -170,7 +175,7 @@ case "$1-$nfs" in
|
|||||||
|
|
||||||
start-yes|reload-yes)
|
start-yes|reload-yes)
|
||||||
echo -n "Starting NFS client services:"
|
echo -n "Starting NFS client services:"
|
||||||
if ! checkproc $PORTMAP_BIN ; then
|
if ! check_portmap ; then
|
||||||
echo "portmap/rpcbind is not running"
|
echo "portmap/rpcbind is not running"
|
||||||
rc_failed 3
|
rc_failed 3
|
||||||
rc_status -v
|
rc_status -v
|
||||||
@ -291,8 +296,8 @@ case "$1-$nfs" in
|
|||||||
echo "idmapd not running"
|
echo "idmapd not running"
|
||||||
rc_failed 3
|
rc_failed 3
|
||||||
fi
|
fi
|
||||||
if ! checkproc /sbin/portmap; then
|
if ! check_portmap; then
|
||||||
echo "Warning: portmap not running - nfs may not work well"
|
echo "Warning: portmap/rpcbind not running - nfs may not work well"
|
||||||
fi
|
fi
|
||||||
rc_status -v
|
rc_status -v
|
||||||
;;
|
;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user