|
 |
f2cbf1 |
From 90f0190ac3d2f77a420aaf6ad78b0fb9b93f4698 Mon Sep 17 00:00:00 2001
|
|
|
f2cbf1 |
From: Eric Sandeen <sandeen@redhat.com>
|
|
|
f2cbf1 |
Date: Mon, 9 Apr 2018 15:28:12 -0400
|
|
|
f2cbf1 |
Subject: [PATCH] e2fsck: warn if checkinterval and broken_system_clock both
|
|
|
f2cbf1 |
set
|
|
|
f2cbf1 |
|
|
|
f2cbf1 |
If broken_system_clock is set in e2fsck.conf and this causes
|
|
|
f2cbf1 |
the check interval to be ignored, make that clear to the user:
|
|
|
f2cbf1 |
|
|
|
f2cbf1 |
e2fsck 1.44.1 (24-Mar-2018)
|
|
|
f2cbf1 |
/dev/sda1: ignoring check interval, broken_system_clock set
|
|
|
f2cbf1 |
/dev/sda1: clean, 11/65536 files, 12955/262144 blocks
|
|
|
f2cbf1 |
|
|
|
f2cbf1 |
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
|
f2cbf1 |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
f2cbf1 |
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
|
|
|
f2cbf1 |
---
|
|
|
f2cbf1 |
e2fsck/unix.c | 5 +++++
|
|
|
f2cbf1 |
1 file changed, 5 insertions(+)
|
|
|
f2cbf1 |
|
|
|
f2cbf1 |
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
|
|
|
f2cbf1 |
index 6f94644..d94d5dc 100644
|
|
|
f2cbf1 |
--- a/e2fsck/unix.c
|
|
|
f2cbf1 |
+++ b/e2fsck/unix.c
|
|
|
f2cbf1 |
@@ -384,7 +384,12 @@ static void check_if_skip(e2fsck_t ctx)
|
|
|
f2cbf1 |
if (batt && ((ctx->now - fs->super->s_lastcheck) <
|
|
|
f2cbf1 |
fs->super->s_checkinterval*2))
|
|
|
f2cbf1 |
reason = 0;
|
|
|
f2cbf1 |
+ } else if (broken_system_clock && fs->super->s_checkinterval) {
|
|
|
f2cbf1 |
+ log_out(ctx, "%s: ", ctx->device_name);
|
|
|
f2cbf1 |
+ log_out(ctx, "%s",
|
|
|
f2cbf1 |
+ _("ignoring check interval, broken_system_clock set\n"));
|
|
|
f2cbf1 |
}
|
|
|
f2cbf1 |
+
|
|
|
f2cbf1 |
if (reason) {
|
|
|
f2cbf1 |
log_out(ctx, "%s", ctx->device_name);
|
|
|
f2cbf1 |
log_out(ctx, reason, reason_arg);
|
|
|
f2cbf1 |
--
|
|
|
f2cbf1 |
2.17.1
|
|
|
f2cbf1 |
|