Revert "Revert "fsck: add new -l switch to fsck mount options""

[elogind.git] / src / fsck.c

diff --git a/src/fsck.c b/src/fsck.c
index 3c1652bc223ab7cf4b4912f16105d0adfe0d21a1..fdcf6b43c5d08335a650f7a0a713f3d3068aa945 100644 (file)
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -142,7 +142,7 @@ static void test_files(void) {
 }
 
 int main(int argc, char *argv[]) {
-        const char *cmdline[7];
+        const char *cmdline[8];
         int i = 0, r = EXIT_FAILURE, q;
         pid_t pid;
         siginfo_t status;
@@ -188,8 +188,8 @@ int main(int argc, char *argv[]) {
                 times[0] = st.st_atim;
                 times[1] = st.st_mtim;
                 if (utimensat(AT_FDCWD, "/", times, 0) == 0) {
-                        log_error("Root directory is writable, skip check.");
-                        goto finish;
+                        log_info("Root directory is writable, skipping check.");
+                        return 0;
                 }
 
                 if (!(udev = udev_new())) {
@@ -213,6 +213,7 @@ int main(int argc, char *argv[]) {
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] = "-a";
         cmdline[i++] = "-T";
+        cmdline[i++] = "-l";
 
         if (!root_directory)
                 cmdline[i++] = "-M";