Fedora: Don't ship a init.d reboot symlink.

[elogind.git] / src / fsck.c

diff --git a/src/fsck.c b/src/fsck.c
index eca2212f476de8dde727097b3f0402e6d4ec4014..96dea660a9be5871c94ceff09b625f3130d7f6bd 100644 (file)
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -31,6 +31,7 @@
 #include "util.h"
 #include "dbus-common.h"
 #include "special.h"
+#include "bus-errors.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
@@ -74,7 +75,12 @@ static void start_target(const char *target, bool isolate) {
         }
 
         if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
-                log_error("Failed to start unit: %s", bus_error_message(&error));
+
+                /* Don't print a waring if we aren't called during
+                 * startup */
+                if (!dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB))
+                        log_error("Failed to start unit: %s", bus_error_message(&error));
+
                 goto finish;
         }
 
@@ -135,13 +141,14 @@ 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;
         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 +165,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 +196,16 @@ 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";