summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2014-10-22 10:28:42 +0200
committerLennart Poettering <lennart@poettering.net>2014-10-22 11:45:36 +0200
commit48d3e8d07f2978f001cc85b2dddb7f8ec9d07006 (patch)
treeb526c2918e2b2850cf6dc00a1e815af122033c37
parent39bb33c19203bdcd8857e9dc9ee6c8f03da77b71 (diff)
fsck: re-enable fsck -l
The -l (lock) has been temporary disabled due to conflict with udev (https://bugs.freedesktop.org/show_bug.cgi?id=79576) The problem is fixed since util-linux v2.25 (Jul 2014).
-rw-r--r--README3
-rw-r--r--src/fsck/fsck.c13
2 files changed, 6 insertions, 10 deletions
diff --git a/README b/README
index e0edd41f17..8f7a96e55e 100644
--- a/README
+++ b/README
@@ -129,8 +129,9 @@ REQUIREMENTS:
During runtime, you need the following additional
dependencies:
- util-linux >= v2.19 (requires fsck -l, agetty -s),
+ util-linux >= v2.19 required for agetty -s
v2.21 required for tests in test/
+ v2.25 required for fsck -l
dbus >= 1.4.0 (strictly speaking optional, but recommended)
sulogin (from util-linux >= 2.22 or sysvinit-tools, optional but recommended,
required for tests in test/)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index dfe97bc260..70a591883e 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -320,16 +320,11 @@ int main(int argc, char *argv[]) {
cmdline[i++] = "-T";
/*
- * Disable locking which conflict with udev's event
- * ownershipi, until util-linux moves the flock
- * synchronization file which prevents multiple fsck running
- * on the same rotationg media, from the disk device
- * node to a privately owned regular file.
- *
- * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
- *
- * cmdline[i++] = "-l";
+ * Since util-linux v2.25 fsck uses /run/fsck/<diskname>.lock files.
+ * The previous versions use flock for the device and conflict with
+ * udevd, see https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
*/
+ cmdline[i++] = "-l";
if (!root_directory)
cmdline[i++] = "-M";