From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Oct 2010 22:44:09 +0000 (+0200)
Subject: fsck: don't be idempotent for root directories
X-Git-Tag: v12~200
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=dc8e15c206ace4f9b424ea6c114a2bc7ee127eab;ds=inline

fsck: don't be idempotent for root directories
---

diff --git a/src/fsck.c b/src/fsck.c
index eca2212f4..e13dcf4d9 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -142,6 +142,7 @@ int main(int argc, char *argv[]) {
         struct udev *udev = NULL;
         struct udev_device *udev_device = NULL;
         const char *device;
+        bool root_directory;
 
         if (argc > 2) {
                 log_error("This program expects one or no arguments.");
@@ -158,9 +159,10 @@ int main(int argc, char *argv[]) {
         if (!arg_force && arg_skip)
                 return 0;
 
-        if (argc > 1)
+        if (argc > 1) {
                 device = argv[1];
-        else {
+                root_directory = false;
+        } else {
                 struct stat st;
 
                 /* Find root device */
@@ -188,13 +190,17 @@ int main(int argc, char *argv[]) {
                         log_error("Failed to detect device node of root directory.");
                         goto finish;
                 }
+
+                root_directory = true;
         }
 
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] = "-a";
         cmdline[i++] = "-T";
         cmdline[i++] = "-C";
-        cmdline[i++] = "-M";
+
+        if (!root_directory)
+                cmdline[i++] = "-M";
 
         if (arg_force)
                 cmdline[i++] = "-f";