From 7a8b6562b59192a83af28fcffe86aa5a63adb2ea Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 09:16:23 +0000 Subject: [PATCH] auto-import changelog data from nfs-utils-0.3.1-11.src.rpm Fri Jul 13 2001 Bob Matthews - Make %pre useradd consistent with other Red Hat packages. Tue Jul 03 2001 Michael K. Johnson - Added sh-utils dependency for uname -r in nfs init script Tue Jun 12 2001 Bob Matthews - make non RH kernel release strings scan correctly in - nfslock init script (#44186) Mon Jun 11 2001 Bob Matthews - don't install any rquota pages in _mandir: (#39707, #44119) - don't try to manipulate rpc.rquotad in init scripts - unless said program actually exists: (#43340) --- nfs-utils.spec | 29 +++++++++++++++++++++-------- nfs.init | 42 ++++++++++++++++++++++++++---------------- nfslock.init | 46 ++++++++++++++++++++++++++++------------------ 3 files changed, 75 insertions(+), 42 deletions(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 30152df..412353d 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 0.3.1 -Release: 8 +Release: 11 Source0: ftp://nfs.sourceforge.net/pub/nfs/nfs-utils-%{version}.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz Source10: nfs.init @@ -26,8 +26,8 @@ Provides: knfsd-clients Provides: knfsd License: GPL Buildroot: %{_tmppath}/%{name}-root -Requires: kernel >= 2.2.14, portmap >= 4.0, sed, gawk -Prereq: /sbin/chkconfig /usr/sbin/useradd +Requires: kernel >= 2.2.14, portmap >= 4.0, sed, gawk, sh-utils +Prereq: /sbin/chkconfig /usr/sbin/useradd /sbin/nologin %description The nfs-utils package provides a daemon for the kernel NFS server and @@ -74,6 +74,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd # we are using quotad from quota utils rm %{buildroot}/%{_mandir}/man8/rquotad* +rm %{buildroot}/%{_mandir}/man8/rpc.rquotad* rm %{buildroot}/%{_sbindir}/rpc.rquotad %clean @@ -81,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT %pre /usr/sbin/useradd -c "RPC Service User" -r \ - -s /bin/false -u 29 -d /var/lib/nfs rpcuser 2>/dev/null || : + -s /sbin/nologin -u 29 -d /var/lib/nfs rpcuser 2>/dev/null || : %post /sbin/chkconfig --add nfs @@ -126,11 +127,23 @@ fi %config /etc/rc.d/init.d/nfslock %changelog -* Fri Apr 21 2001 Bill Nottingham -- re-disable quota stuff for non-errata :) +* Fri Jul 13 2001 Bob Matthews +- Make %pre useradd consistent with other Red Hat packages. -* Tue Apr 17 2001 Preston Brown -- re-enable quota stuff for errata +* Tue Jul 03 2001 Michael K. Johnson +- Added sh-utils dependency for uname -r in nfs init script + +* Tue Jun 12 2001 Bob Matthews +- make non RH kernel release strings scan correctly in +- nfslock init script (#44186) + +* Mon Jun 11 2001 Bob Matthews +- don't install any rquota pages in _mandir: (#39707, #44119) +- don't try to manipulate rpc.rquotad in init scripts +- unless said program actually exists: (#43340) + +* Tue Apr 10 2001 Preston Brown +- don't translate initscripts for 6.x * Tue Apr 10 2001 Michael K. Johnson - do not start lockd on kernel 2.2.18 or higher (done automatically) diff --git a/nfs.init b/nfs.init index 2ba02cf..115004a 100755 --- a/nfs.init +++ b/nfs.init @@ -42,44 +42,54 @@ else RPCMOUNTDOPTS="--no-nfs-version 3" fi +if [ -n "$MOUNTD_PORT" ]; then + RPCMOUNDOPTS="$RPCMOUNTDOPTS --port $MOUNTD_PORT" +fi + # See how we were called. case "$1" in start) # Start daemons. - action $"Starting NFS services: " /usr/sbin/exportfs -r - echo -n $"Starting NFS quotas: " - daemon rpc.rquotad - echo - echo -n $"Starting NFS mountd: " + action "Starting NFS services: " /usr/sbin/exportfs -r + if [ -x /usr/sbin/rpc.rquotad ] ; then + echo -n "Starting NFS quotas: " + daemon rpc.rquotad + echo + fi + echo -n "Starting NFS mountd: " daemon rpc.mountd $RPCMOUNTDOPTS echo - echo -n $"Starting NFS daemon: " + echo -n "Starting NFS daemon: " daemon rpc.nfsd $RPCNFSDCOUNT echo touch /var/lock/subsys/nfs ;; stop) # Stop daemons. - echo -n $"Shutting down NFS mountd: " + echo -n "Shutting down NFS mountd: " killproc rpc.mountd echo - echo -n $"Shutting down NFS daemon: " + echo -n "Shutting down NFS daemon: " killproc nfsd echo - action $"Shutting down NFS services: " /usr/sbin/exportfs -au - echo -n $"Shutting down NFS quotas: " - killproc rpc.rquotad - echo + action "Shutting down NFS services: " /usr/sbin/exportfs -au + if [ -x /usr/sbin/rpc.rquotad ] ; then + echo -n "Shutting down NFS quotas: " + killproc rpc.rquotad + echo + fi rm -f /var/lock/subsys/nfs ;; status) status rpc.mountd status nfsd - status rpc.rquotad + if [ -x /usr/sbin/rpc.rquotad ] ; then + status rpc.rquotad + fi ;; restart) - echo -n $"Restarting NFS services: " - echo -n $"rpc.mountd " + echo -n "Restarting NFS services: " + echo -n "rpc.mountd " killproc rpc.mountd daemon rpc.mountd $RPCMOUNTDOPTS /usr/sbin/exportfs -r @@ -104,7 +114,7 @@ case "$1" in fi ;; *) - echo $"Usage: $0 {start|stop|status|restart|reload}" + echo "Usage: $0 {start|stop|status|restart|reload}" exit 1 esac diff --git a/nfslock.init b/nfslock.init index 72e0454..29bcbf3 100755 --- a/nfslock.init +++ b/nfslock.init @@ -22,25 +22,35 @@ fi # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 -KERNVER=`uname -r | awk -F . '{ print $1.$2 }'` -KERNREL=`uname -r | awk -F '[.-]' '{ print $3 }'` +# Start lockd from userland only if kernel <= 2.2.18 +OS_RELEASE=`uname --release` +OS_RELEASE_MAJOR=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\..*/\1/'` +OS_RELEASE_MINOR=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\.\([0-9]*\)\..*/\2/'` +OS_RELEASE_VERSION=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` + +if [ "$OS_RELEASE_MAJOR" -le 2 -a "$OS_RELEASE_MINOR" -le 2 -a "$OS_RELEASE_VERSION" -le 18 ] ; then + USERLAND_LOCKD="yes" +else + USERLAND_LOCKD= +fi + +if [ "$USERLAND_LOCKD" ] ; then + [ -x /sbin/rpc.lockd ] || exit 0 +fi + +[ -x /sbin/rpc.statd ] || exit 0 RETVAL=0 -if [ "$KERNVER" -lt 24 ]; then - [ -x /sbin/rpc.lockd ] || exit 0 -fi -[ -x /sbin/rpc.statd ] || exit 0 - start() { # Start daemons. - echo $"Starting NFS file locking services: " - if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then - echo -n $"Starting NFS lockd: " + echo "Starting NFS file locking services: " + if [ "$USERLAND_LOCKD" ]; then + echo -n "Starting NFS lockd: " daemon rpc.lockd echo fi - echo -n $"Starting NFS statd: " + echo -n "Starting NFS statd: " daemon rpc.statd RETVAL=$? echo @@ -50,13 +60,13 @@ start() { stop() { # Stop daemons. - echo $"Shutting down NFS file locking services: " - if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then - echo -n $"Shutting down NFS lockd: " + echo "Shutting down NFS file locking services: " + if [ "$USERLAND_LOCKD" ]; then + echo -n "Shutting down NFS lockd: " killproc lockd echo fi - echo -n $"Shutting down NFS statd: " + echo -n "Shutting down NFS statd: " killproc rpc.statd RETVAL=0 echo @@ -73,7 +83,7 @@ case "$1" in stop ;; status) - if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then + if [ "$USERLAND_LOCKD" ]; then status lockd fi status rpc.statd @@ -87,7 +97,7 @@ case "$1" in echo start; exit 0 fi /sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?" - if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then + if [ "$USERLAND_LOCKD" ]; then /sbin/pidof lockd >/dev/null 2>&1; LOCKD="$?" else LOCKD=0 @@ -97,7 +107,7 @@ case "$1" in fi ;; *) - echo $"Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart}" exit 1 esac