|
 |
923a60 |
From 42026958cced6fe111bbaccad04d24d8ca3d6c55 Mon Sep 17 00:00:00 2001
|
|
|
923a60 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
923a60 |
Date: Fri, 14 Nov 2014 17:07:57 +0100
|
|
|
923a60 |
Subject: [PATCH] Revert "fsck: re-enable fsck -l"
|
|
|
923a60 |
|
|
|
923a60 |
This reverts commit 48d3e8d07f2978f001cc85b2dddb7f8ec9d07006.
|
|
|
923a60 |
|
|
|
923a60 |
(We have older util-linux in rhel7))
|
|
|
923a60 |
|
|
|
923a60 |
Conflicts:
|
|
|
923a60 |
README
|
|
|
923a60 |
---
|
|
|
923a60 |
README | 3 ++-
|
|
|
923a60 |
src/fsck/fsck.c | 13 +++++++++----
|
|
|
923a60 |
2 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
923a60 |
|
|
|
923a60 |
diff --git a/README b/README
|
|
|
923a60 |
index c72209262e..5f5783a684 100644
|
|
|
923a60 |
--- a/README
|
|
|
923a60 |
+++ b/README
|
|
|
923a60 |
@@ -135,7 +135,8 @@ REQUIREMENTS:
|
|
|
923a60 |
During runtime, you need the following additional
|
|
|
923a60 |
dependencies:
|
|
|
923a60 |
|
|
|
923a60 |
- util-linux >= v2.25 required
|
|
|
923a60 |
+ util-linux >= v2.19 (requires fsck -l, agetty -s),
|
|
|
923a60 |
+ v2.21 required for tests in test/
|
|
|
923a60 |
dbus >= 1.4.0 (strictly speaking optional, but recommended)
|
|
|
923a60 |
dracut (optional)
|
|
|
923a60 |
PolicyKit (optional)
|
|
|
923a60 |
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
|
|
|
923a60 |
index 78ceeb6fab..d8976809d1 100644
|
|
|
923a60 |
--- a/src/fsck/fsck.c
|
|
|
923a60 |
+++ b/src/fsck/fsck.c
|
|
|
923a60 |
@@ -323,11 +323,16 @@ int main(int argc, char *argv[]) {
|
|
|
923a60 |
cmdline[i++] = "-T";
|
|
|
923a60 |
|
|
|
923a60 |
/*
|
|
|
923a60 |
- * Since util-linux v2.25 fsck uses /run/fsck/<diskname>.lock files.
|
|
|
923a60 |
- * The previous versions use flock for the device and conflict with
|
|
|
923a60 |
- * udevd, see https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
|
|
|
923a60 |
+ * Disable locking which conflict with udev's event
|
|
|
923a60 |
+ * ownershipi, until util-linux moves the flock
|
|
|
923a60 |
+ * synchronization file which prevents multiple fsck running
|
|
|
923a60 |
+ * on the same rotationg media, from the disk device
|
|
|
923a60 |
+ * node to a privately owned regular file.
|
|
|
923a60 |
+ *
|
|
|
923a60 |
+ * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
|
|
|
923a60 |
+ *
|
|
|
923a60 |
+ * cmdline[i++] = "-l";
|
|
|
923a60 |
*/
|
|
|
923a60 |
- cmdline[i++] = "-l";
|
|
|
923a60 |
|
|
|
923a60 |
if (!root_directory)
|
|
|
923a60 |
cmdline[i++] = "-M";
|