* Mon Oct 03 2008 Eric Sandeen <sandeen@redhat.com> 1.41.3-2
- New upstream version (very minor fixes, ext4-related)
This commit is contained in:
parent
9ba2642d8c
commit
b9b16196e7
@ -1 +1 @@
|
|||||||
e2fsprogs-1.41.2.tar.gz
|
e2fsprogs-1.41.3.tar.gz
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
If only ext4 is available (as a module or in /proc/filesystems)
|
|
||||||
blkid wasn't properly testing for it, because the time checks
|
|
||||||
were backwards and always failed. This caused old ext4dev
|
|
||||||
filesystems to fail to mount as ext4. With this patch it works
|
|
||||||
fine.
|
|
||||||
|
|
||||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
Index: e2fsprogs/lib/blkid/probe.c
|
|
||||||
===================================================================
|
|
||||||
--- e2fsprogs.orig/lib/blkid/probe.c 2008-09-12 10:37:52.000000000 -0500
|
|
||||||
+++ e2fsprogs/lib/blkid/probe.c 2008-10-08 13:28:42.218001472 -0500
|
|
||||||
@@ -243,7 +243,7 @@ static int system_supports_ext4(void)
|
|
||||||
static int ret = -1;
|
|
||||||
time_t now = time(0);
|
|
||||||
|
|
||||||
- if (ret != -1 || (last_check - now) < 5)
|
|
||||||
+ if (ret != -1 || (now - last_check) < 5)
|
|
||||||
return ret;
|
|
||||||
last_check = now;
|
|
||||||
ret = (fs_proc_check("ext4") || check_for_modules("ext4"));
|
|
||||||
@@ -256,7 +256,7 @@ static int system_supports_ext4dev(void)
|
|
||||||
static int ret = -1;
|
|
||||||
time_t now = time(0);
|
|
||||||
|
|
||||||
- if (ret != -1 || (last_check - now) < 5)
|
|
||||||
+ if (ret != -1 || (now - last_check) < 5)
|
|
||||||
return ret;
|
|
||||||
last_check = now;
|
|
||||||
ret = (fs_proc_check("ext4dev") || check_for_modules("ext4dev"));
|
|
@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
|
Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
|
||||||
Name: e2fsprogs
|
Name: e2fsprogs
|
||||||
Version: 1.41.2
|
Version: 1.41.3
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
# License based on upstream-modified COPYING file,
|
# License based on upstream-modified COPYING file,
|
||||||
# which clearly states "V2" intent.
|
# which clearly states "V2" intent.
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -16,7 +16,6 @@ Source3: uuidd.init
|
|||||||
Patch1: e2fsprogs-1.38-etcblkid.patch
|
Patch1: e2fsprogs-1.38-etcblkid.patch
|
||||||
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
||||||
Patch3: e2fsprogs-journal-move.patch
|
Patch3: e2fsprogs-journal-move.patch
|
||||||
Patch4: e2fsprogs-fix-blkid.patch
|
|
||||||
|
|
||||||
Url: http://e2fsprogs.sourceforge.net/
|
Url: http://e2fsprogs.sourceforge.net/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -95,8 +94,6 @@ SMP systems.
|
|||||||
%patch2 -p1 -b .featurecheck
|
%patch2 -p1 -b .featurecheck
|
||||||
# Only change the journal placement for ext4, for now.
|
# Only change the journal placement for ext4, for now.
|
||||||
%patch3 -p1 -b .journalmove
|
%patch3 -p1 -b .journalmove
|
||||||
# Fix blkid to recognize ext4dev as mountable by ext4
|
|
||||||
%patch4 -p1 -b .blkid
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
|
%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper --enable-blkid-selinux
|
||||||
@ -295,6 +292,9 @@ fi
|
|||||||
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 03 2008 Eric Sandeen <sandeen@redhat.com> 1.41.3-2
|
||||||
|
- New upstream version (very minor fixes, ext4-related)
|
||||||
|
|
||||||
* Thu Oct 02 2008 Eric Sandeen <sandeen@redhat.com> 1.41.2-2
|
* Thu Oct 02 2008 Eric Sandeen <sandeen@redhat.com> 1.41.2-2
|
||||||
- Fix blkid to recognize ext4dev filesystems as ext4-mountable
|
- Fix blkid to recognize ext4dev filesystems as ext4-mountable
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user