[Pkg-lustre-svn-commit] updated: [1f3badd] Try to fix quota

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 1f3baddba7491ab35ce8d5699ef8d0ec61340d2e
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Nov 26 13:39:08 2008 +0100

    Try to fix quota

diff --git a/debian/patches/enable-quota.dpatch b/debian/patches/enable-quota.dpatch
index ec1cfe4..ddcf06a 100755
--- a/debian/patches/enable-quota.dpatch
+++ b/debian/patches/enable-quota.dpatch
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad lustre-1.6.6~/configure.ac lustre-1.6.6/configure.ac
---- lustre-1.6.6~/configure.ac	2008-11-26 12:52:35.000000000 +0100
-+++ lustre-1.6.6/configure.ac	2008-11-26 12:52:44.000000000 +0100
+--- lustre-1.6.6~/configure.ac	2008-11-26 13:32:11.000000000 +0100
++++ lustre-1.6.6/configure.ac	2008-11-26 13:37:27.000000000 +0100
 @@ -8,6 +8,7 @@
  LB_CHECK_VERSION
  
@@ -16,9 +16,9 @@ diff -urNad lustre-1.6.6~/configure.ac lustre-1.6.6/configure.ac
  AC_CANONICAL_SYSTEM
  
 diff -urNad lustre-1.6.6~/lustre/autoconf/lustre-core.m4 lustre-1.6.6/lustre/autoconf/lustre-core.m4
---- lustre-1.6.6~/lustre/autoconf/lustre-core.m4	2008-11-26 12:52:44.000000000 +0100
-+++ lustre-1.6.6/lustre/autoconf/lustre-core.m4	2008-11-26 13:04:55.000000000 +0100
-@@ -1676,9 +1676,6 @@
+--- lustre-1.6.6~/lustre/autoconf/lustre-core.m4	2008-11-26 13:37:22.000000000 +0100
++++ lustre-1.6.6/lustre/autoconf/lustre-core.m4	2008-11-26 13:38:08.000000000 +0100
+@@ -1676,24 +1676,9 @@
          AC_HELP_STRING([--enable-quota],
                          [enable quota support]),
          [],[enable_quota='default'])
@@ -26,9 +26,24 @@ diff -urNad lustre-1.6.6~/lustre/autoconf/lustre-core.m4 lustre-1.6.6/lustre/aut
 -        enable_quota='no'
 -fi
  LB_LINUX_CONFIG([QUOTA],[
-         if test x$enable_quota = xdefault; then
+-        if test x$enable_quota = xdefault; then
                  enable_quota='yes'
-@@ -1715,6 +1712,7 @@
+-        fi
+ ],[
+-        if test x$enable_quota = xdefault; then
+-                enable_quota='no'
+-                AC_MSG_WARN([quota is not enabled because the kernel lacks quota
+- support])
+-        else
+-                if test x$enable_quota = xyes; then
+-                        AC_MSG_ERROR([cannot enable quota because the kernel lac
+-ks quota support])
+-                fi
+-        fi
+ ])
+ if test x$enable_quota != xno; then
+         AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support])
+@@ -1715,6 +1700,7 @@
  ])
  ])
  

-- 
Lustre Debian Packaging