From 98ca3072d428705500f9c69bd703ece7494d9ce1 Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Tue, 10 Apr 2018 14:19:14 +0200 Subject: [PATCH] Remove custom e2fsck.conf It's no longer needed to set broken_system_clock in e2fsck.conf. It was se to default (0) for some time now, so just remove the custom e2fsck.conf. Signed-off-by: Lukas Czerner --- e2fsck.conf | 3 --- e2fsprogs.spec | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 e2fsck.conf diff --git a/e2fsck.conf b/e2fsck.conf deleted file mode 100644 index 5f1e800..0000000 --- a/e2fsck.conf +++ /dev/null @@ -1,3 +0,0 @@ -[options] -# If set to 1, prevent e2fsck from stopping boot just because the clock is wrong -broken_system_clock = 0 diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 5e7b339..b55ef40 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -8,7 +8,6 @@ License: GPLv2 Group: System Environment/Base Source0: https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{version}/%{name}-%{version}.tar.xz Source1: ext2_types-wrapper.h -Source2: e2fsck.conf Patch1: e2fsprogs-1.44.1-tests_use_mke2fs_and_debugfs_from_the_build_tree.patch Patch2: 0001-e2fsprogs-fix-metadata-image-handling-on-big-endian-.patch @@ -178,9 +177,6 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/ext2fs/ext2_types.h # Hack for now, otherwise strip fails. chmod +w %{buildroot}%{_libdir}/*.a -# Let boot continue even if *gasp* clock is wrong -install -p -m 644 %{SOURCE2} %{buildroot}/etc/e2fsck.conf - %find_lang %{name} %check @@ -213,7 +209,6 @@ exit 0 %{!?_licensedir:%global license %%doc} %config(noreplace) /etc/mke2fs.conf -%config(noreplace) /etc/e2fsck.conf %{_sbindir}/badblocks %{_sbindir}/debugfs %{_sbindir}/dumpe2fs @@ -336,6 +331,7 @@ exit 0 - remove custom patch to ignose sb feature differences - e2fsprogs: fix metadata image handling on big endian systems - fix spelling errors in spec file +- remove custom e2fsck.conf * Mon Mar 12 2018 Lukas Czerner 1.44.0-2 - e2fsck: fix endianness problem when reading htree nodes