From 47bc6998f38dc4196e2dde32bf075acfa204db6e084d9da46a00b44dc7253d82 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 13 Sep 2007 22:48:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/quota?expand=0&rev=8

---
 quota-3.15-ignore_nfs.patch | 11 +++++++++++
 quota.changes               |  6 ++++++
 quota.spec                  | 11 ++++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 quota-3.15-ignore_nfs.patch

diff --git a/quota-3.15-ignore_nfs.patch b/quota-3.15-ignore_nfs.patch
new file mode 100644
index 0000000..5a69c49
--- /dev/null
+++ b/quota-3.15-ignore_nfs.patch
@@ -0,0 +1,11 @@
+--- quotaon.c
++++ quotaon.c
+@@ -346,7 +346,7 @@
+ 	else if (!kernel_formats)
+ 		errstr(_("Warning: No quota format detected in the kernel.\n"));
+ 
+-	if (init_mounts_scan(mntcnt, mntpoints, MS_XFS_DISABLED) < 0)
++	if (init_mounts_scan(mntcnt, mntpoints, MS_XFS_DISABLED | MS_LOCALONLY) < 0)
+ 		return 1;
+ 	while ((mnt = get_next_mount())) {
+ 		if (nfs_fstype(mnt->mnt_type)) {
diff --git a/quota.changes b/quota.changes
index a32c317..20b36a6 100644
--- a/quota.changes
+++ b/quota.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 13 23:41:59 CEST 2007 - lmichnovic@suse.cz
+
+- Ignoring NFS mount points when shutting down quota with quotaoff
+  [#310426] (ignore_nfs.patch)
+
 -------------------------------------------------------------------
 Thu Aug  9 11:40:26 CEST 2007 - lmichnovic@suse.cz
 
diff --git a/quota.spec b/quota.spec
index 8712cdf..110435a 100644
--- a/quota.spec
+++ b/quota.spec
@@ -13,12 +13,12 @@
 Name:           quota
 BuildRequires:  e2fsprogs-devel tcpd-devel
 Version:        3.15
-Release:        8
+Release:        17
 PreReq:         %insserv_prereq %fillup_prereq
-Autoreqprov:    on
+AutoReqProv:    on
 Group:          System/Filesystems
 License:        GPL v2 or later
-URL:            http://sourceforge.net/projects/linuxquota/
+Url:            http://sourceforge.net/projects/linuxquota/
 Summary:        Disk Quota System
 Source:         %{name}-3.15.tar.bz2
 Source1:        %{name}-SUSE.tar.bz2
@@ -26,6 +26,7 @@ Patch1:         %{name}-%{version}-mode.patch
 Patch2:         %{name}-%{version}-man.patch
 Patch3:         %{name}-%{version}-warnquota.patch
 Patch4:         %{name}-%{version}-type.patch
+Patch5:         %{name}-%{version}-ignore_nfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -48,6 +49,7 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5
 find -type d -name CVS -exec rm -rf {} \; -prune
 find -type d | xargs chmod 755
 
@@ -100,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 
 %changelog
+* Thu Sep 13 2007 - lmichnovic@suse.cz
+- Ignoring NFS mount points when shutting down quota with quotaoff
+  [#310426] (ignore_nfs.patch)
 * Thu Aug 09 2007 - lmichnovic@suse.cz
 - fixed running quotacheck on mounted partition [#298713]
 - added $network should be enabled when stoping quota service