fsck: disable "-l" option for now

  https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5

diff --git a/TODO b/TODO
index 8169a574736ae0eddcfdce1a580d6dfb391f0695..fb118f155028d32d6012f61f8dca0484be7a4a5a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,7 @@
 Bugfixes:
 Bugfixes:

+* Re-enable "fsck -l" when it is ready:
+   https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
+

 * Should systemctl status \* work on all unit types, not just .service?
 
 * enabling an instance unit creates a pointless link, and
 * Should systemctl status \* work on all unit types, not just .service?
 
 * enabling an instance unit creates a pointless link, and


@@ -20,7 +23,6 @@ Bugfixes:
   See the comment in sd_bus_unref() for more..
 
 External:
   See the comment in sd_bus_unref() for more..
 
 External:

-

 * Fedora: when installing fedora with yum --installroot /var/run is a directory, not a symlink
    https://bugzilla.redhat.com/show_bug.cgi?id=975864
 
 * Fedora: when installing fedora with yum --installroot /var/run is a directory, not a symlink
    https://bugzilla.redhat.com/show_bug.cgi?id=975864
 

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 56cb52dc99ecb585e714d37902d8e75fd7750fbd..cb2f5734ea069ddf11a0a9ddd17bfd44ce23ddb6 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -319,7 +319,18 @@ int main(int argc, char *argv[]) {
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] =  arg_repair;
         cmdline[i++] = "-T";
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] =  arg_repair;
         cmdline[i++] = "-T";

-        cmdline[i++] = "-l";
+
+        /*
+         * 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";
+         */

 
         if (!root_directory)
                 cmdline[i++] = "-M";
 
         if (!root_directory)
                 cmdline[i++] = "-M";