[pve-devel] r6544 - pve-kernel-2.6.32-rh/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-09-16 06:15:34 +0200 (Fri, 16 Sep 2011)
New Revision: 6544

Modified:
   pve-kernel-2.6.32-rh/trunk/README
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
   pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff
Log:
disable OCFS2 again (source is too old and seems unmaintained)


Modified: pve-kernel-2.6.32-rh/trunk/README
===================================================================
--- pve-kernel-2.6.32-rh/trunk/README	2011-09-16 03:36:15 UTC (rev 6543)
+++ pve-kernel-2.6.32-rh/trunk/README	2011-09-16 04:15:34 UTC (rev 6544)
@@ -103,9 +103,7 @@
 
 - disable module signatures (CONFIG_MODULE_SIG, CONFIG_CRYPTO_SIGNATURE)
 
-- enable OCFS2
 
-
 Testing final kernel with kvm
 -----------------------------
 

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-16 03:36:15 UTC (rev 6543)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-16 04:15:34 UTC (rev 6544)
@@ -2,8 +2,6 @@
 
   * update to vzkernel-2.6.32-042stab036.6.src.rpm
   
-  * enable OCFS2
-
  -- Proxmox Support Team <support at proxmox.com>  Fri, 16 Sep 2011 05:35:22 +0200
 
 pve-kernel-2.6.32 (2.6.32-43) unstable; urgency=low

Modified: pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff	2011-09-16 03:36:15 UTC (rev 6543)
+++ pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff	2011-09-16 04:15:34 UTC (rev 6544)
@@ -52,21 +52,6 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -3824,7 +3829,13 @@
- # CONFIG_XFS_DEBUG is not set
- CONFIG_GFS2_FS=m
- CONFIG_GFS2_FS_LOCKING_DLM=y
--# CONFIG_OCFS2_FS is not set
-+CONFIG_OCFS2_FS=m
-+CONFIG_OCFS2_FS_O2CB=m
-+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-+CONFIG_OCFS2_FS_STATS=y
-+CONFIG_OCFS2_DEBUG_MASKLOG=y
-+# CONFIG_OCFS2_DEBUG_FS is not set
-+CONFIG_OCFS2_FS_POSIX_ACL=y 
- CONFIG_BTRFS_FS=m
- CONFIG_BTRFS_FS_POSIX_ACL=y
- # CONFIG_NILFS2_FS is not set
 @@ -4049,7 +4060,7 @@
  # Kernel hacking
  #