OBS User unknown 2008-06-23 02:30:26 +00:00 committed by Git OBS Bridge
parent 584f4fc299
commit 0a0bbe6a8f
3 changed files with 14 additions and 2 deletions

View File

@ -6,6 +6,7 @@ Subject: [PATCH] Make sure statd gets started when 'string options' are in use.
The code for checking and starting statd was only in the binary-options The code for checking and starting statd was only in the binary-options
branch of the code. branch of the code.
This moves it into common code. This moves it into common code.
... and don't check for statd if '-o remount'
--- ---
utils/mount/mount.c | 22 ++++++++++++++++++++-- utils/mount/mount.c | 22 ++++++++++++++++++++--
utils/mount/nfsmount.c | 11 ----------- utils/mount/nfsmount.c | 11 -----------
@ -57,7 +58,7 @@ index 5076468..0036caa 100644
goto out; goto out;
} }
+ if (!fake && lock) { + if (!fake && lock && ! (flags & MS_REMOUNT) && strcmp(fs_type,"nfs")==0) {
+ if (!start_statd()) { + if (!start_statd()) {
+ nfs_error(_("%s: rpc.statd is not running but is " + nfs_error(_("%s: rpc.statd is not running but is "
+ "required for remote locking.\n" + "required for remote locking.\n"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 6 08:00:21 CEST 2008 - nfbrown@suse.de
- nfs-utils-1.1.2-start-statd.patch - fix so that statd isn't
required with "-o remount" (that causes a problem with
nfs-root (bnc#397417)) and isn't required for nfsv4.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 2 13:20:17 CEST 2008 - lnussel@suse.de Mon Jun 2 13:20:17 CEST 2008 - lnussel@suse.de

View File

@ -16,7 +16,7 @@ BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent libgssglue-devel lib
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.2 Version: 1.1.2
Release: 8 Release: 10
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
@ -258,6 +258,10 @@ 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 Jun 06 2008 nfbrown@suse.de
- nfs-utils-1.1.2-start-statd.patch - fix so that statd isn't
required with "-o remount" (that causes a problem with
nfs-root (bnc#397417)) and isn't required for nfsv4.
* Mon Jun 02 2008 lnussel@suse.de * Mon Jun 02 2008 lnussel@suse.de
- fix permissions handling of mount.nfs (bnc#304318) - fix permissions handling of mount.nfs (bnc#304318)
- fix prereqs - fix prereqs