1
0
mirror of https://github.com/systemd/systemd synced 2024-07-08 20:15:55 +00:00

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).
This commit is contained in:
Karel Zak 2014-10-22 10:28:42 +02:00 committed by Lennart Poettering
parent 39bb33c192
commit 48d3e8d07f
2 changed files with 6 additions and 10 deletions

3
README
View File

@ -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/)

View File

@ -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";