From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 19 Nov 2010 03:22:36 +0000 (+0100)
Subject: Revert "Revert "fsck: add new -l switch to fsck mount options""
X-Git-Tag: v14~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9ecea880571e520c60fae2dd2f10fcfd7dd1ab8;p=systemd

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

This reverts commit c8bc83f5eac49f083ae53d965577118c1b5c1116.

As Karel pointed out the -l switch doesn't actualy conflict with
per-filesystem options, since those can be seperated by -- in the
command line. Since -l is here to stay we hence enable it again for now.
---

diff --git a/src/fsck.c b/src/fsck.c
index dfaf221b..fdcf6b43 100644
--- 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;
@@ -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";