From f56aa431d9c34ce62ddea5e6d62f5d06bbe03f6a Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Tue, 28 Aug 2012 18:55:50 +0000 Subject: [PATCH] Accepting request 131510 from home:namtrac:branches:filesystems - Add an /etc/e2fsck.conf file with broken_system_clock=1 to fix first part of bnc#775268 OBS-URL: https://build.opensuse.org/request/show/131510 OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=33 --- e2fsck.conf | 4 ++++ e2fsprogs.changes | 6 ++++++ e2fsprogs.spec | 7 +++++++ 3 files changed, 17 insertions(+) create mode 100644 e2fsck.conf diff --git a/e2fsck.conf b/e2fsck.conf new file mode 100644 index 0000000..489668f --- /dev/null +++ b/e2fsck.conf @@ -0,0 +1,4 @@ +[options] +# This will prevent e2fsck from stopping boot just because the clock is wrong +broken_system_clock = 1 + diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 232a2ba..6ad3d0b 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 24 09:36:51 UTC 2012 - idonmez@suse.com + +- Add an /etc/e2fsck.conf file with broken_system_clock=1 to fix + first part of bnc#775268 + ------------------------------------------------------------------- Thu Jun 14 07:47:40 UTC 2012 - coolo@suse.com diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 2175388..4e7c007 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -39,6 +39,7 @@ Requires: libext2fs2 >= %{version} Source: http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.gz Source2: README.SUSE Source3: baselibs.conf +Source4: e2fsck.conf # # e2fsprogs patches # @@ -149,7 +150,12 @@ make -C po update-po %install make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir} + +# Let boot continue even if system clock is wrong +install -p -m 644 %{SOURCE3} %{buildroot}/etc/e2fsck.conf + %{find_lang} %{name} + rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev rm -f $RPM_BUILD_ROOT/%{_sbindir}/fsck.ext4dev @@ -210,6 +216,7 @@ done %files -f %{name}.lang %defattr(-, root, root) %doc RELEASE-NOTES README +%config /etc/e2fsck.conf %config /etc/mke2fs.conf #UsrMerge /sbin/badblocks