X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck.c;h=96dea660a9be5871c94ceff09b625f3130d7f6bd;hb=472ff3d64a870dcd767ecf61e07d89d8fb2f272d;hp=e13dcf4d9d975a95cfc46a4a86c13bb0f5f932e0;hpb=dc8e15c206ace4f9b424ea6c114a2bc7ee127eab;p=elogind.git diff --git a/src/fsck.c b/src/fsck.c index e13dcf4d9..96dea660a 100644 --- 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,7 +141,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; @@ -197,7 +203,6 @@ int main(int argc, char *argv[]) { cmdline[i++] = "/sbin/fsck"; cmdline[i++] = "-a"; cmdline[i++] = "-T"; - cmdline[i++] = "-C"; if (!root_directory) cmdline[i++] = "-M";