Revision: 5188
http://ipcop.svn.sourceforge.net/ipcop/?rev=5188&view=rev
Author: gespinasse
Date: 2010-11-28 22:01:48 +0000 (Sun, 28 Nov 2010)
Log Message:
-----------
Add a fix (Fedora borrowed) for e2fsck
Modified Paths:
--------------
ipcop/trunk/lfs/e2fsprogs
ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
ipcop/trunk/updates/1.9.18/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/e2fsprogs-1.41.12-EOFBLOCKS-test.patch
Modified: ipcop/trunk/lfs/e2fsprogs
===================================================================
--- ipcop/trunk/lfs/e2fsprogs 2010-11-28 21:36:13 UTC (rev 5187)
+++ ipcop/trunk/lfs/e2fsprogs 2010-11-28 22:01:48 UTC (rev 5188)
@@ -81,6 +81,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)-EOFBLOCKS-test.patch
cd $(DIR_APP) && mkdir -v build
# Not sure of uuidd interest for us, so I have disabled for now.
Added: ipcop/trunk/src/patches/e2fsprogs-1.41.12-EOFBLOCKS-test.patch
===================================================================
--- ipcop/trunk/src/patches/e2fsprogs-1.41.12-EOFBLOCKS-test.patch
(rev 0)
+++ ipcop/trunk/src/patches/e2fsprogs-1.41.12-EOFBLOCKS-test.patch
2010-11-28 22:01:48 UTC (rev 5188)
@@ -0,0 +1,32 @@
+From: Eric Sandeen <[email protected]>
+Date: Wed, 19 May 2010 18:20:13 +0000 (-0500)
+Subject: e2fsck: correct test for EOFBLOCKS
+X-Git-Url:
http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=ae2272f8459f75c064b2644320db4ec5213d40a9
+
+e2fsck: correct test for EOFBLOCKS
+
+This test, added to e2fsprogs-1.41.12, is backwards.
+
+If EOFBLOCKS is set, then the size -should- be less than
+the last physical block...
+
+xfstests 013 caught this.
+
+Signed-off-by: Eric Sandeen <[email protected]>
+Signed-off-by: Theodore Ts'o <[email protected]>
+---
+
+diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
+index c35937f..4bf80d2 100644
+--- a/e2fsck/pass1.c
++++ b/e2fsck/pass1.c
+@@ -2013,7 +2013,7 @@ static void check_blocks(e2fsck_t ctx, struct
problem_context *pctx,
+ * doesn't need to be.
+ */
+ if ((inode->i_flags & EXT4_EOFBLOCKS_FL) &&
+- (size <= (((__u64)pb.last_block + 1) * fs->blocksize))) {
++ (size >= (((__u64)pb.last_block + 1) * fs->blocksize))) {
+ pctx->blkcount = pb.last_block;
+ if (fix_problem(ctx, PR_1_EOFBLOCKS_FL_SET, pctx)) {
+ inode->i_flags &= ~EXT4_EOFBLOCKS_FL;
+
Modified: ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18
===================================================================
--- ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18 2010-11-28 21:36:13 UTC
(rev 5187)
+++ ipcop/trunk/updates/1.9.18/ROOTFILES.i486-1.9.18 2010-11-28 22:01:48 UTC
(rev 5188)
@@ -200,6 +200,9 @@
## dhcpcd-5.2.9
/usr/sbin/dhcpcd
##
+## e2fsprogs-1.41.12 fixed
+/sbin/e2fsck
+##
## ethtool-2.6.35
/usr/sbin/ethtool
##
Modified: ipcop/trunk/updates/1.9.18/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.18/information.xml 2010-11-28 21:36:13 UTC (rev
5187)
+++ ipcop/trunk/updates/1.9.18/information.xml 2010-11-28 22:01:48 UTC (rev
5188)
@@ -9,7 +9,7 @@
iptables to 1.4.10, iputils to s20101006, iw to 0.9.21, libnl to 2.0,
libpng to 1.4.4, libxml2 to 2.7.8,
openssh to 5.6, openssl to 0.9.8p, openswan to 2.6.31, pango to 1.28.3,
pixman to 0.18.4, psmisc to 22.13, smartmontools to 5.40, sqlite to
3.7.3, tar to 1.25, traceroute to 2.0.16,
- usb-modeswitch to 1.1.4, usbutils to 0.91, vim to 7.3.</description>
+ usb-modeswitch to 1.1.4, usbutils to 0.91, vim to 7.3. Fixed
e2fsck</description>
<previousversion>1.9.17</previousversion>
<nextversion>1.9.19</nextversion>
</update>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
