From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 26 Dec 2010 12:02:12 +0000 (+0100)
Subject: Revert upstream commit which uses fsck -l (needs a newer version of util-linux).
X-Git-Tag: 16-1~23
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e12634df0ddf762fc844abea95ed9876c99d86ca;p=systemd

Revert upstream commit which uses fsck -l (needs a newer version of util-linux).
---

diff --git a/debian/changelog b/debian/changelog
index 39a17bf9..c72e2163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ systemd (15-1) experimental; urgency=low
   * Revert upstream change which requires libnotify 0.7 (not yet available in
     Debian).
   * Use dh-autoreconf for updating the build system.
+  * Revert upstream commit which uses fsck -l (needs a newer version of
+    util-linux).
   * Install lsb-base hook which redirects calls to SysV init scripts to
     systemctl: /etc/init.d/<foo> <action> → systemctl <action> <foo.service>
   * Install a (auto)mount unit to mount /lib/init/rw early during boot.
diff --git a/src/fsck.c b/src/fsck.c
index fdcf6b43..dfaf221b 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[8];
+        const char *cmdline[7];
         int i = 0, r = EXIT_FAILURE, q;
         pid_t pid;
         siginfo_t status;
@@ -213,7 +213,6 @@ 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";