From 0f7bdcabcdfc412e9cf206a102e88fc3f80a0c7d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 09:19:09 +0000 Subject: [PATCH] auto-import nfs-utils-1.0.1-1 from nfs-utils-1.0.1-1.src.rpm --- .cvsignore | 2 +- nfs-utils.spec | 18 ++----- nfs.init | 127 ++++++++++++++----------------------------------- sources | 2 +- 4 files changed, 40 insertions(+), 109 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5dab2ba..c7a30ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -nfs-utils-0.3.3.tar.gz +nfs-utils-1.0.1.tar.gz nfs.doc.tar.gz diff --git a/nfs-utils.spec b/nfs-utils.spec index 8e7e376..404cac3 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,8 +1,8 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils -Version: 0.3.3 -Release: 6.73 -Source0: ftp://nfs.sourceforge.net/pub/nfs/nfs-utils-%{version}.tar.gz +Version: 1.0.1 +Release: 1 +Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.1.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz Source10: nfs.init Source11: nfslock.init @@ -12,7 +12,6 @@ Patch2: no-chroot.patch Patch3: nfs-utils-0.3.3.statd-manpage.patch Patch4: eepro-support.patch Patch5: time-h.patch -Patch6: nfs-utils-1.0.3-mountd.secfix.patch Group: System Environment/Daemons Obsoletes: nfs-server Obsoletes: knfsd @@ -47,7 +46,6 @@ clients which are mounted on that host. %patch3 -p1 -b .statd-manpage %patch4 -p1 -b .eepro-support %patch5 -p1 -b .time-h -%patch6 -p1 -b .secfix %build # @@ -93,12 +91,9 @@ fi %post /sbin/chkconfig --add nfs /sbin/chkconfig --add nfslock -/sbin/service nfs condrestart %preun if [ "$1" = "0" ]; then - status="`/sbin/service nfs probe`" - [ -z "$status" ] && /sbin/service nfs stop /sbin/chkconfig --del nfs /sbin/chkconfig --del nfslock /usr/sbin/userdel rpcuser 2>/dev/null || : @@ -137,13 +132,6 @@ fi %config /etc/rc.d/init.d/nfslock %changelog -* Fri Jun 20 2003 Steve Dickson -- Added mountd security fix - -* Thu Aug 1 2002 Bob Matthews -- Add Sean O'Connell's nfs control tweaks -- to nfs init script. - * Mon Jul 22 2002 Bob Matthews - Move to nfs-utils-1.0.1 diff --git a/nfs.init b/nfs.init index d09dbce..e2c3947 100755 --- a/nfs.init +++ b/nfs.init @@ -8,7 +8,6 @@ # networks. This service provides NFS server functionality, \ # which is configured via the /etc/exports file. # probe: true -# config: /etc/sysconfig/nfs # Source function library. . /etc/rc.d/init.d/functions @@ -32,120 +31,69 @@ fi { echo "#" > /etc/exports && chmod u+rw,g+r,o+r /etc/exports ; } || \ { echo "/etc/exports does not exist" ; exit 0 ; } -# Check for and source configuration file otherwise set defaults -# TUNE_QUEUE: controls whether to up the size of input queues -[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs - -[ -z "$MOUNTD_NFS_V2" ] && MOUNTD_NFS_V2=auto -[ -z "$MOUNTD_NFS_V3" ] && MOUNTD_NFS_V3=auto - # Number of servers to be started by default -[ -z "$RPCNFSDCOUNT" ] && RPCNFSDCOUNT=8 +RPCNFSDCOUNT=8 -# Remote quota server -[ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad` +# NFSv3 only if kernel >= 2.2.18 +OS_RELEASE=`uname --release` +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_MINOR" -gt 2 ]; then + RPCMOUNTDOPTS= +elif [ "$OS_RELEASE_MINOR" -eq 2 -a "$OS_RELEASE_VERSION" -ge 18 ]; then + RPCMOUNTDOPTS= +else + RPCMOUNTDOPTS="--no-nfs-version 3" +fi -# Get the initial values for the input sock queues -# at the time of running the script. -if [ "$TUNE_QUEUE" = "yes" ]; then - RMEM_DEFAULT=`/sbin/sysctl -n net.core.rmem_default` - RMEM_MAX=`/sbin/sysctl -n net.core.rmem_max` - # 256kb recommended minimum size based on SPECsfs NFS benchmarks - [ -z "$NFS_QS" ] && NFS_QS=262144 +if [ -n "$MOUNTD_PORT" ]; then + RPCMOUNTDOPTS="$RPCMOUNTDOPTS --port $MOUNTD_PORT" fi # See how we were called. case "$1" in start) # Start daemons. - # Apply input queue increase for nfs server - if [ "$TUNE_QUEUE" = "yes" ]; then - /sbin/sysctl -w net.core.rmem_default=$NFSD_QS >/dev/null 2>&1 - /sbin/sysctl -w net.core.rmem_max=$NFSD_QS >/dev/null 2>&1 - fi action $"Starting NFS services: " /usr/sbin/exportfs -r - if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then - echo -n "Starting NFS quotas: " + if [ -x /usr/sbin/rpc.rquotad ] ; then + echo -n $"Starting NFS quotas: " daemon rpc.rquotad echo fi - echo -n $"Starting NFS daemon: " - daemon rpc.nfsd $RPCNFSDCOUNT - echo - - [ -n "$MOUNTD_PORT" ] \ - && RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT" - - case $MOUNTD_NFS_V2 in - auto|AUTO) - # Let's see if we support NFS version 2. - /usr/sbin/rpcinfo -u localhost nfs 2 &>/dev/null - if [ $? -ne 0 ]; then - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 2" - fi - ;; - no|NO) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 2" - ;; - yes|YES) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --nfs-version 2" - ;; - esac - - case $MOUNTD_NFS_V3 in - auto|AUTO) - # Let's see if we support NFS version 3. - /usr/sbin/rpcinfo -u localhost nfs 3 &>/dev/null - if [ $? -ne 0 ]; then - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3" - fi - ;; - no|NO) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3" - ;; - yes|YES) - RPCMOUNTDOPTS="$RPCMOUNTDOPTS --nfs-version 3" - ;; - esac - echo -n $"Starting NFS mountd: " daemon rpc.mountd $RPCMOUNTDOPTS echo + echo -n $"Starting NFS daemon: " + daemon rpc.nfsd $RPCNFSDCOUNT + echo touch /var/lock/subsys/nfs - # reset input queue for rest of network services - if [ "$TUNE_QUEUE" = "yes" ]; then - /sbin/sysctl -w net.core.rmem_default=$RMEM_DEFAULT >/dev/null 2>&1 - /sbin/sysctl -w net.core.rmem_max=$RMEM_MAX >/dev/null 2>&1 - fi ;; stop) # Stop daemons. - echo -n $"Shutting down NFS mountd: " + echo -n $"Stopping NFS mountd: " killproc rpc.mountd echo - echo -n $"Shutting down NFS daemon: " + echo -n $"Stopping NFS daemon: " killproc nfsd echo - if [ -n "$RQUOTAD" ]; then - echo -n "Shutting down NFS quotas: " - killproc rpc.rquotad - echo + action $"Stopping NFS services: " /usr/sbin/exportfs -au + if [ -x /usr/sbin/rpc.rquotad ] ; then + echo -n $"Stopping NFS quotas: " + killproc rpc.rquotad + echo fi - # Do it the last so that clients can still access the server - # when the server is running. - action $"Shutting down NFS services: " /usr/sbin/exportfs -au rm -f /var/lock/subsys/nfs ;; status) status rpc.mountd status nfsd - if [ -n "$RQUOTAD" ]; then - status rpc.rquotad + if [ -x /usr/sbin/rpc.rquotad ] ; then + status rpc.rquotad fi ;; restart) - $0 stop - $0 start + $0 stop || : + $0 start ;; reload) /usr/sbin/exportfs -r @@ -153,26 +101,21 @@ case "$1" in ;; probe) if [ ! -f /var/lock/subsys/nfs ] ; then - echo $"start"; exit 0 + echo start; exit 0 fi /sbin/pidof rpc.mountd >/dev/null 2>&1; MOUNTD="$?" /sbin/pidof nfsd >/dev/null 2>&1; NFSD="$?" if [ $MOUNTD = 1 -o $NFSD = 1 ] ; then - echo $"restart"; exit 0 + echo restart; exit 0 fi if [ /etc/exports -nt /var/lock/subsys/nfs ] ; then - echo $"reload"; exit 0 + echo reload; exit 0 fi ;; - condrestart) - [ -f /var/lock/subsys/nfs ] && { - $0 stop - $0 start - } - ;; *) - echo $"Usage: nfs {start|stop|status|restart|reload|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|reload}" exit 1 esac exit 0 + diff --git a/sources b/sources index bb5c24d..4b891b8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a33ad83846a7ca49af3b3106badf7af6 nfs-utils-0.3.3.tar.gz +7a9f802911cf2a79942338b1269b3d5b nfs-utils-1.0.1.tar.gz ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz