X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F05-ignore-quota-option.patch;fp=debian%2Fpatches%2F05-ignore-quota-option.patch;h=29859389b93f95ffbb0ad0151b5c97f86ba7b8da;hb=2ac79288fc1ddc0326af1b2c5b9ffd6d023bf376;hp=0000000000000000000000000000000000000000;hpb=59840096395f070e67af445e509037ef565520d0;p=nfs-utils.git

diff --git a/debian/patches/05-ignore-quota-option.patch b/debian/patches/05-ignore-quota-option.patch
new file mode 100644
index 0000000..2985938
--- /dev/null
+++ b/debian/patches/05-ignore-quota-option.patch
@@ -0,0 +1,22 @@
+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.
+
+Index: nfs-utils-1.1.0/utils/mount/mount.c
+===================================================================
+--- nfs-utils-1.1.0.orig/utils/mount/mount.c
++++ nfs-utils-1.1.0/utils/mount/mount.c
+@@ -132,6 +132,10 @@ static const struct opt_map opt_map[] = 
+   { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
+   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
+ #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		}
+ };
+