[kernel] r12122 - in dists/trunk/linux-modules-extra-2.6: aufs debian

[Bastian Blank]

Author: waldi
Date: Thu Aug 21 11:28:45 2008
New Revision: 12122

Log:
* aufs/defines: Disable on vserver.
* debian/changelog: Update.


Modified:
   dists/trunk/linux-modules-extra-2.6/aufs/defines
   dists/trunk/linux-modules-extra-2.6/debian/changelog

Modified: dists/trunk/linux-modules-extra-2.6/aufs/defines
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/aufs/defines	(original)
+++ dists/trunk/linux-modules-extra-2.6/aufs/defines	Thu Aug 21 11:28:45 2008
@@ -1,4 +1,6 @@
 [base]
+# See Bug#495921
+not-featuresets: vserver
 desc: Stackable unification filesystem
 longdesc:
  Aufs is a stackable unification filesystem such as Unionfs, which unifies

Modified: dists/trunk/linux-modules-extra-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/changelog	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/changelog	Thu Aug 21 11:28:45 2008
@@ -1,8 +1,9 @@
 linux-modules-extra-2.6 (2.6.26-3) UNRELEASED; urgency=low
 
-  * Reenable aufs always.
+  * Reenable aufs on s390/s390x.
   * Build against verion 2.6.26-3 (add VServer images).
   * Disable et131x on vserver featureset, see #495918.
+  * Disable aufs on vserver featureset, see #495921.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 21 Aug 2008 11:06:07 +0200