Imported Debian patch 1.1.2-1

[nfs-utils.git] / debian / patches / 05-ignore-quota-option.patch

diff --git a/debian/patches/05-ignore-quota-option.patch b/debian/patches/05-ignore-quota-option.patch
deleted file mode 100644 (file)
index 22c53ef..0000000
--- a/debian/patches/05-ignore-quota-option.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.1/utils/mount/mount.c
-===================================================================
---- nfs-utils-1.1.1.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.1/utils/mount/mount.c
-@@ -130,6 +130,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         }
- };
-