rpms/kernel/F-10 squashfs-fixups.patch, NONE, 1.1 kernel.spec, 1.1302, 1.1303

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9513

Modified Files:
	kernel.spec 
Added Files:
	squashfs-fixups.patch 
Log Message:
Fix up squashfs v3/v4 conflicts.

squashfs-fixups.patch:

--- NEW FILE squashfs-fixups.patch ---
Index: linux-2.6.29.noarch/init/do_mounts_rd.c
===================================================================
--- linux-2.6.29.noarch.orig/init/do_mounts_rd.c
+++ linux-2.6.29.noarch/init/do_mounts_rd.c
@@ -110,6 +110,7 @@ identify_ramdisk_image(int fd, int start
 	}
 
 	/* squashfs is at block zero too */
+#if defined(CONFIG_SQUASHFS) || defined(CONFIG_SQUASHFS_MODULE)
 	if (le32_to_cpu(squashfsb->s_magic) == SQUASHFS_MAGIC) {
 		printk(KERN_NOTICE
 		       "RAMDISK: squashfs filesystem found at block %d\n",
@@ -118,8 +119,7 @@ identify_ramdisk_image(int fd, int start
 			 >> BLOCK_SIZE_BITS;
 		goto done;
 	}
-
-	/* squashfs is at block zero too */
+#else  /* v3 */
 	if (squashfsb->s_magic == SQUASHFS_MAGIC) {
 		printk(KERN_NOTICE
 		       "RAMDISK: squashfs filesystem found at block %d\n",
@@ -130,6 +130,7 @@ identify_ramdisk_image(int fd, int start
 			nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS;
 		goto done;
 	}
+#endif
 
 	/*
 	 * Read block 1 to test for minix and ext2 superblock


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -r1.1302 -r1.1303
--- kernel.spec	24 Mar 2009 03:15:26 -0000	1.1302
+++ kernel.spec	24 Mar 2009 04:30:57 -0000	1.1303
@@ -662,7 +662,9 @@
 Patch2911: linux-2.6-ext4-flush-on-close.patch
 
 Patch9000: squashfs3.patch
-Patch9001: revert-fix-modules_install-via-nfs.patch
+Patch9001: squashfs-fixups.patch
+
+Patch9010: revert-fix-modules_install-via-nfs.patch
 
 %endif
 
@@ -1192,6 +1194,7 @@
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
+ApplyPatch squashfs-fixups.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -1772,6 +1775,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Mar 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-3
+- Fix up squashfs v3/v4 conflicts.
+
 * Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-2
 - Change default swappiness setting from 60 to 30.
 - Build in the pcie hotplug driver on x86.