enable JFS file system

diff --git a/Makefile b/Makefile
index 54046ae59ac8897c762e3645153cdac1707504ce..4688c0d3c6b5e7503322e9c237c6a60208982c29 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=59
+PKGREL=60
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=7

diff --git a/README b/README
index 683bb3515ad29ccfd177b8e1231804b0615a1605..e567159f1bb0d73311301120ea5f9478dec874f6 100644 (file)
--- a/README
+++ b/README
@@ -90,6 +90,10 @@ see config-2.6.32.diff
         CONFIG_USB_IP_VHCI_HCD=m
         CONFIG_USB_IP_HOST=m
 
+- enable IBM JFS file system
+
+  This is disabled in RHEL kernel for no real reason, so we enable
+  it as requested by users (bug #64)
 
 Testing final kernel with kvm
 -----------------------------

diff --git a/changelog.Debian b/changelog.Debian
index f1bdd320a1ea6b7e452441dd702bfbb2b3216a7b..36b6bada621838d93142cf1437af7522398baf42 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-60) unstable; urgency=low
+
+  * enable JFS file system
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 16 Feb 2012 08:47:43 +0100
+
 pve-kernel-2.6.32 (2.6.32-59) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab049.6.src.rpm

diff --git a/config-2.6.32.diff b/config-2.6.32.diff
index 57602db4ec17e8b9d8352ebf3c1fc1db3ddea227..b986e9de4ac203301a557b99fb27e27b623a00b7 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,5 +1,5 @@
---- config-2.6.32-042stab046.1.x86_64  2012-01-10 08:56:05.000000000 +0100
-+++ config-2.6.32      2012-01-11 06:36:34.000000000 +0100
+--- config-2.6.32-042stab049.6.x86_64  2012-02-13 07:18:08.000000000 +0100
++++ config-2.6.32      2012-02-16 08:44:34.000000000 +0100
 @@ -103,7 +103,7 @@
  CONFIG_FAIR_GROUP_SCHED=y
  CONFIG_CFS_BANDWIDTH=y
@@ -18,7 +18,7 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
-@@ -1342,10 +1342,10 @@
+@@ -1344,10 +1344,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -31,7 +31,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1423,7 +1423,7 @@
+@@ -1425,7 +1425,7 @@
  # CONFIG_SCSI_DMX3191D is not set
  # CONFIG_SCSI_EATA is not set
  # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -40,7 +40,7 @@
  CONFIG_SCSI_ISCI=m
  CONFIG_SCSI_IPS=m
  CONFIG_SCSI_INITIO=m
-@@ -1540,7 +1540,7 @@
+@@ -1542,7 +1542,7 @@
  # CONFIG_MULTICORE_RAID456 is not set
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
@@ -49,7 +49,7 @@
  CONFIG_DM_DEBUG=y
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -3118,6 +3118,11 @@
+@@ -3121,6 +3121,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
@@ -61,7 +61,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -3716,7 +3721,9 @@
+@@ -3719,7 +3724,9 @@
  # CONFIG_SLICOSS is not set
  # CONFIG_VIDEO_GO7007 is not set
  # CONFIG_VIDEO_CX25821 is not set
@@ -72,7 +72,20 @@
  # CONFIG_W35UND is not set
  # CONFIG_PRISM2_USB is not set
  # CONFIG_ECHO is not set
-@@ -4083,7 +4090,7 @@
+@@ -3851,7 +3858,11 @@
+ CONFIG_REISERFS_FS_XATTR=y
+ CONFIG_REISERFS_FS_POSIX_ACL=y
+ CONFIG_REISERFS_FS_SECURITY=y
+-# CONFIG_JFS_FS is not set
++CONFIG_JFS_FS=m
++CONFIG_JFS_POSIX_ACL=y
++CONFIG_JFS_SECURITY=y
++# CONFIG_JFS_DEBUG is not set
++# CONFIG_JFS_STATISTICS is not set
+ CONFIG_FS_POSIX_ACL=y
+ CONFIG_XFS_FS=m
+ CONFIG_XFS_QUOTA=y
+@@ -4087,7 +4098,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -81,7 +94,7 @@
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4127,7 +4134,7 @@
+@@ -4131,7 +4142,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -90,7 +103,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4356,8 +4363,8 @@
+@@ -4360,8 +4371,8 @@
  #
  CONFIG_CRYPTO_ANSI_CPRNG=m
  CONFIG_CRYPTO_MPILIB=y

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index cdf81d89c50ca9bc46d21349f56d102f2effc5b7..a44d0ac8ed08c17e6b1fb8294f4e7b0346afb09a 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,3 +1,9 @@
+proxmox-ve-2.6.32 (2.0-60) unstable; urgency=low
+
+  *  re-package to update version number
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 16 Feb 2012 08:48:29 +0100
+
 proxmox-ve-2.6.32 (2.0-38) unstable; urgency=low
 
   * re-package to update version number