diff --git a/e2fsprogs-1.41.10-no-alignment-question.patch b/e2fsprogs-1.41.10-no-alignment-question.patch new file mode 100644 index 0000000..e33a122 --- /dev/null +++ b/e2fsprogs-1.41.10-no-alignment-question.patch @@ -0,0 +1,23 @@ +[PATCH] mke2fs: skip alignment questioning if -F specified + +RH bug 569021 - mke2fs insists on user interaction even if stdin is not a tty and -F is passed + +This is just a warning, -F should easily override it. + +Signed-off-by: Eric Sandeen +--- + +diff --git a/misc/mke2fs.c b/misc/mke2fs.c +index 4b13367..2a23bf7 100644 +--- a/misc/mke2fs.c ++++ b/misc/mke2fs.c +@@ -1643,7 +1643,8 @@ got_size: + device_name, retval); + printf(_("This may result in very poor performance, " + "(re)-partitioning suggested.\n")); +- proceed_question(); ++ if (!force) ++ proceed_question(); + } + #endif + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 8bf79a4..81d11ba 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,7 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs Version: 1.41.10 -Release: 4%{?dist} +Release: 5%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -14,6 +14,7 @@ Source1: ext2_types-wrapper.h Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch Patch3: e2fsprogs-1.41.10-fsck-D-fix.patch +Patch4: e2fsprogs-1.41.10-no-alignment-question.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,6 +141,8 @@ It was originally inspired by the Multics SubSystem library. # E2fsprogs 1.41.10 introduced a regression (in commit b71e018) where # e2fsck -fD can corrupt non-indexed directories %patch3 -p1 -b .fsckD +# Don't ask about alignment issues if -F is specified to fsck +%patch4 -p1 -b .fsckF %build %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \ @@ -299,6 +302,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Mon Mar 01 2010 Eric Sandeen 1.41.10-5 +- Don't ask for confirmation of misaligned mkfs with -F (#569021) + * Tue Feb 23 2010 Eric Sandeen 1.41.10-4 - Fix for e2fsck -fD corruption