system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fsck: re-enable fsck -l

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -129,8 +129,9 @@ REQUIREMENTS:
During runtime, you need the following additional During runtime, you need the following additional
dependencies: 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.21 required for tests in test/
v2.25 required for fsck -l
dbus >= 1.4.0 (strictly speaking optional, but recommended) dbus >= 1.4.0 (strictly speaking optional, but recommended)
sulogin (from util-linux >= 2.22 or sysvinit-tools, optional but recommended, sulogin (from util-linux >= 2.22 or sysvinit-tools, optional but recommended,
required for tests in test/) required for tests in test/)

13
src/fsck/fsck.c
View file

@ -320,16 +320,11 @@ int main(int argc, char *argv[]) {
cmdline[i++] = "-T"; cmdline[i++] = "-T";
/* /*
* Disable locking which conflict with udev's event * Since util-linux v2.25 fsck uses /run/fsck/<diskname>.lock files.
* ownershipi, until util-linux moves the flock * The previous versions use flock for the device and conflict with
* synchronization file which prevents multiple fsck running * udevd, see https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
* 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";
*/ */
cmdline[i++] = "-l";
if (!root_directory) if (!root_directory)
cmdline[i++] = "-M"; cmdline[i++] = "-M";