rpms/util-linux-ng/devel util-linux-ng-2.16-libblkid-ext2.patch, NONE, 1.1 util-linux-ng.spec, 1.54, 1.55
kzak
kzak at fedoraproject.org
Thu Aug 13 22:22:43 UTC 2009
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26119
Modified Files:
util-linux-ng.spec
Added Files:
util-linux-ng-2.16-libblkid-ext2.patch
Log Message:
* Thu Aug 13 2009 Karel Zak <kzak at redhat.com> 2.16-5
- fix #513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
util-linux-ng-2.16-libblkid-ext2.patch:
ext.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE util-linux-ng-2.16-libblkid-ext2.patch ---
>From 92cf3ab964266603cf36272d0eec96cd07fa083c Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Thu, 13 Aug 2009 21:55:43 +0200
Subject: [PATCH] libblkid: fix ext2 detection on systems with ext4 only
Address-Red-Hat-Bug: #513104
Signed-off-by: Karel Zak <kzak at redhat.com>
---
shlibs/blkid/src/probers/ext.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c
index 671e556..a4d35d1 100644
--- a/shlibs/blkid/src/probers/ext.c
+++ b/shlibs/blkid/src/probers/ext.c
@@ -483,11 +483,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
return -BLKID_ERR_PARAM;
- /* Ext4 has at least one feature which ext3 doesn't understand */
- if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
- !(fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
- return -BLKID_ERR_PARAM;
-
/*
* If the filesystem does not have a journal and ext2 is not
* present, then force this to be detected as an ext2
@@ -498,6 +493,12 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
get_linux_version() >= EXT4_SUPPORTS_EXT2)
goto force_ext4;
+ /* Ext4 has at least one feature which ext3 doesn't understand */
+ if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
+ !(fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
+ return -BLKID_ERR_PARAM;
+
+force_ext4:
/*
* If the filesystem is a OK for use by in-development
* filesystem code, and ext4dev is supported or ext4 is not
@@ -513,7 +514,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
return -BLKID_ERR_PARAM;
}
-force_ext4:
ext_get_info(pr, 4, es);
return 0;
}
--
1.6.2.5
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- util-linux-ng.spec 5 Aug 2009 07:45:59 -0000 1.54
+++ util-linux-ng.spec 13 Aug 2009 22:22:43 -0000 1.55
@@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux-ng
Version: 2.16
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -103,6 +103,8 @@ Patch5: util-linux-ng-2.16-blkid-cachefi
Patch7: util-linux-ng-2.13-login-lastlog.patch
# 231192 - ipcs is not printing correct values on pLinux
Patch8: util-linux-ng-2.15-ipcs-32bit.patch
+# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
+Patch9: util-linux-ng-2.16-libblkid-ext2.patch
%description
The util-linux-ng package contains a large variety of low-level system
@@ -197,6 +199,7 @@ cp %{SOURCE8} %{SOURCE9} .
%patch5 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
unset LINGUAS || :
@@ -707,6 +710,9 @@ fi
%changelog
+* Thu Aug 13 2009 Karel Zak <kzak at redhat.com> 2.16-5
+- fix #513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
+
* Wed Aug 5 2009 Stepan Kasal <skasal at redhat.com> 2.16-4
- set conflict with versions of e2fsprogs containing fsck
More information about the fedora-extras-commits
mailing list