e2fsck no longer prompts whether to fix mount or write times that are
up to 24 hours ahead of the current time; it always does so. Update
the old NEWS entry about this, and add a versioned Breaks to ensure we
get the new version.
Closes: #804071
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
debian/NEWS | 2 ++
debian/control | 2 +-
hooks/fsck | 9 ---------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
index 52a8f9b..e862c61 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -30,6 +30,8 @@ initramfs-tools (0.119) unstable; urgency=medium
following lines in /etc/e2fsck.conf:
[options]
broken_system_clock=1
+ [As of e2fsprogs version 1.42.13 this message is informational, and
+ no configuration change is required.]
-- Ben Hutchings <ben@decadent.org.uk> Mon, 13 Apr 2015 01:00:21 +0100
diff --git a/debian/control b/debian/control
index a943598..94862c2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: initramfs-tools-core (= ${binary:Version}), linux-base, ${misc:Depends}
Suggests: bash-completion
Provides: linux-initramfs-tool
Conflicts: linux-initramfs-tool, usplash (<< 0.5.50)
-Breaks: cryptsetup (<< 2:1.6.6-4~), elilo (<< 3.12-3.1~), lilo (<< 22.8-8.2~), s390-tools (<< 1.8.3-2~), console-setup (<< 1.72), systemd-sysv (<< 186), lvm2 (<< 2.02.111-2.1~), initscripts (<< 2.88dsf-59.3~), upstart
+Breaks: cryptsetup (<< 2:1.6.6-4~), elilo (<< 3.12-3.1~), lilo (<< 22.8-8.2~), s390-tools (<< 1.8.3-2~), console-setup (<< 1.72), systemd-sysv (<< 186), lvm2 (<< 2.02.111-2.1~), initscripts (<< 2.88dsf-59.3~), upstart, e2fsprogs (<< 1.42.13)
Description: generic modular initramfs generator (automation)
This package builds a bootable initramfs for Linux kernel packages. The
initramfs is loaded along with the kernel and is responsible for
diff --git a/hooks/fsck b/hooks/fsck
index 0cebf94..4472f6a 100755
--- a/hooks/fsck
+++ b/hooks/fsck
@@ -102,15 +102,6 @@ fi
copy_exec /sbin/fsck
copy_exec /sbin/logsave
-# e2fsck may fail or warn if the system time is not yet correct, which
-# will happen if the RTC driver is modular or the RTC is set to local
-# time. Disable this behaviour. (No other fsck does this, apparently.)
-mkdir -p "${DESTDIR}/etc"
-cat >"${DESTDIR}/etc/e2fsck.conf" <<EOF
-[options]
-broken_system_clock=1
-EOF
-
for type in $fsck_types; do
if [ "$type" = 'auto' ] ; then
echo "Warning: couldn't identify filesystem type for fsck hook, ignoring."
Attachment:
signature.asc
Description: Digital signature