OBS User unknown 2007-09-14 14:24:10 +00:00 committed by Git OBS Bridge
parent 5827009d64
commit 29891d00a5
3 changed files with 17 additions and 6 deletions

View File

@ -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 Wed Sep 12 15:36:34 CEST 2007 - ro@suse.de

View File

@ -12,15 +12,15 @@
Name: nfs-utils Name: nfs-utils
BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent librpcsecgss nfsidmap-devel pkgconfig tcpd-devel 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 Summary: Support Utilities for Kernel nfsd
Version: 1.1.0 Version: 1.1.0
Release: 6 Release: 7
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
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
Autoreqprov: on AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: ftp://ftp.sourceforge.net/pub/sourceforge/n/nf/nfs/nfs-utils-%{version}.tar.bz2 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 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 %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
%changelog %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 * Wed Sep 12 2007 - ro@suse.de
- drop conflicts with nfs-server (userspace) in nfs-client package - drop conflicts with nfs-server (userspace) in nfs-client package
showmount has been removed there (#309782) showmount has been removed there (#309782)

View File

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