rpms/grub/devel grub-support-256byte-inode.patch, NONE, 1.1 grub.spec, 1.61, 1.62

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24407

Modified Files:
	grub.spec 
Added Files:
	grub-support-256byte-inode.patch 
Log Message:
* Fri Jan 25 2008 Jesse Keating <jkeating at redhat.com> - 0.97-21
- Add a patch from esandeen to support booting from 256byte inodes.


grub-support-256byte-inode.patch:

--- NEW FILE grub-support-256byte-inode.patch ---
diff -up ./stage2/fsys_ext2fs.c.256byte-inode ./stage2/fsys_ext2fs.c
--- ./stage2/fsys_ext2fs.c.256byte-inode	2008-01-25 15:13:01.000000000 -0500
+++ ./stage2/fsys_ext2fs.c	2008-01-25 15:14:13.000000000 -0500
@@ -613,8 +613,9 @@ ext2fs_dir (char *dirname)
       /* reset indirect blocks! */
       mapblock2 = mapblock1 = -1;
 
-      raw_inode = INODE +
-	((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1));
+      raw_inode = (struct ext2_inode *)((char *)INODE +
+	((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) *
+	EXT2_INODE_SIZE (SUPERBLOCK));
 #ifdef E2DEBUG
       printf ("ipb=%d, sizeof(inode)=%d\n",
 	      EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK));


Index: grub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grub/devel/grub.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- grub.spec	5 Nov 2007 20:43:36 -0000	1.61
+++ grub.spec	25 Jan 2008 20:20:17 -0000	1.62
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -17,6 +17,7 @@
 URL: http://www.gnu.org/software/%{name}/
 Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: grub-fedora-9.patch
+Patch1: grub-support-256byte-inode.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fedora-9
+%patch1 -p1 -b .256byte-inode
 
 %build
 autoreconf
@@ -91,6 +93,9 @@
 %endif
 
 %changelog
+* Fri Jan 25 2008 Jesse Keating <jkeating at redhat.com> - 0.97-21
+- Add a patch from esandeen to support booting from 256byte inodes.
+
 * Mon Nov 05 2007 Peter Jones <pjones at redhat.com> - 0.97-20
 - Add EFI support from Intel on x86_64