X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=cb2f5734ea069ddf11a0a9ddd17bfd44ce23ddb6;hb=c343be283b7152554bac0c02493a4e1759c163f7;hp=594f21e070ee90846984e1b954bc13529e887f1a;hpb=f1f0198cb61a3398557cc9ec596e1e90ac731ed3;p=elogind.git

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 594f21e07..cb2f5734e 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -301,10 +301,12 @@ int main(int argc, char *argv[]) {
                 r = fsck_exists(type);
                 if (r < 0) {
                         if (r == -ENOENT) {
-                                log_info("fsck.%s doesn't exist, not checking file system.", type);
+                                log_info("fsck.%s doesn't exist, not checking file system on %s",
+                                         type, device);
                                 return EXIT_SUCCESS;
                         } else
-                                log_warning("fsck.%s cannot be used: %s", type, strerror(-r));
+                                log_warning("fsck.%s cannot be used for %s: %s",
+                                            type, device, strerror(-r));
                 }
         }
 
@@ -317,7 +319,18 @@ int main(int argc, char *argv[]) {
         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";