summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteinar H. Gunderson <sgunderson@bigfoot.com>2008-03-10 14:49:31 -0400
committerSteve Dickson <steved@redhat.com>2008-03-10 14:49:31 -0400
commit00511ee5c97793fa8bf3f463ac07cbb4029ca149 (patch)
tree4d4621151d39eadd26c5f1e181be1af4c261829f
parent8c947a43b6eb4ae1ab0c034e6ba6e8ec035b3505 (diff)
downloadnfs-utils-00511ee5c97793fa8bf3f463ac07cbb4029ca149.tar.gz
nfs-utils-00511ee5c97793fa8bf3f463ac07cbb4029ca149.tar.xz
nfs-utils-00511ee5c97793fa8bf3f463ac07cbb4029ca149.zip
The mount(5) man page states that the noquota, quota, usrquota and
grpquota options are ignored. (They are, however, used by the quota tools, so having them in fstab can be useful.) Make mount.nfs ignore them properly, matching the man page. There are a few aliases (like usrjquota) that are parsed by quota, but as these are not documented nor seem to be widely used, they are not included. Signed-off-by: Steinar H. Gunderson <sgunderson@bigfoot.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/mount/mount.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 403d6f4..839a329 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -136,6 +136,10 @@ static const struct opt_map opt_map[] = {
{ "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
to mtime/ctime */
#endif
+ { "noquota", 0, 0, MS_DUMMY }, /* Don't enforce quota */
+ { "quota", 0, 0, MS_DUMMY }, /* Enforce user quota */
+ { "usrquota", 0, 0, MS_DUMMY }, /* Enforce user quota */
+ { "grpquota", 0, 0, MS_DUMMY }, /* Enforce group quota */
{ NULL, 0, 0, 0 }
};