OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=11

nfs-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 14 12:22:08 CEST 2007 - ro@suse.de
+
+- use "--no-nfs-version 4" for nfsd and mountd if
+  NFS4_SUPPORT is set to "no" (#308661)
+
 -------------------------------------------------------------------
 Wed Sep 12 15:36:34 CEST 2007 - ro@suse.de
 

nfs-utils.spec

@@ -12,15 +12,15 @@
 
 Name:           nfs-utils
 BuildRequires:  e2fsprogs-devel gcc-c++ krb5-devel libevent librpcsecgss nfsidmap-devel pkgconfig tcpd-devel
-URL:            http://nfs.sourceforge.net
+Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.1.0
-Release:        6
+Release:        7
 Group:          Productivity/Networking/NFS
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq %insserv_prereq
-Autoreqprov:    on
+AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        ftp://ftp.sourceforge.net/pub/sourceforge/n/nf/nfs/nfs-utils-%{version}.tar.bz2
 Source1:        ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
@@ -232,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
 
 %changelog
+* Fri Sep 14 2007 - ro@suse.de
+- use "--no-nfs-version 4" for nfsd and mountd if
+  NFS4_SUPPORT is set to "no" (#308661)
 * Wed Sep 12 2007 - ro@suse.de
 - drop conflicts with nfs-server (userspace) in nfs-client package
   showmount has been removed there (#309782)

nfsserver.init

@@ -168,8 +168,10 @@ case "$1" in
       fi
       if [ "$NFS4_SUPPORT" = "yes" ]; then
        echo "+2 +3 +4" > /proc/fs/nfsd/versions
+       VERSION_PARAMS=""
       else
        echo "+2 +3 -4" > /proc/fs/nfsd/versions
+       VERSION_PARAMS="--no-nfs-version 4"
       fi
       nfs4_bind_mounts
       # svcgssd; idmapd
@@ -195,9 +197,9 @@ case "$1" in
       # rpc.mountd
       echo -n " mountd"
       if [ -n "$MOUNTD_PORT" ] ; then
-	startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT
+	startproc /usr/sbin/rpc.mountd -p $MOUNTD_PORT $VERSION_PARAMS
       else
-	startproc /usr/sbin/rpc.mountd
+	startproc /usr/sbin/rpc.mountd $VERSION_PARAMS
       fi
       if [ $? != 0 ]; then
           rc_status -v
@@ -212,7 +214,7 @@ case "$1" in
       fi
       # rpc.nfsd
       echo -n " nfsd"
-      $NFSD_BIN $PARAMS
+      $NFSD_BIN $PARAMS $VERSION_PARAMS
       if [ $? != 0 ]; then
           rc_status -v
           rc_exit