X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck.c;h=fdcf6b43c5d08335a650f7a0a713f3d3068aa945;hb=ec14911e0d6b9473f4f1d6b43d7fcd67c48c2ffc;hp=e13dcf4d9d975a95cfc46a4a86c13bb0f5f932e0;hpb=dc8e15c206ace4f9b424ea6c114a2bc7ee127eab;p=elogind.git

diff --git a/src/fsck.c b/src/fsck.c
index e13dcf4d9..fdcf6b43c 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <libudev.h>
 #include <dbus/dbus.h>
@@ -31,6 +32,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;
@@ -38,7 +40,7 @@ static bool arg_force = false;
 static void start_target(const char *target, bool isolate) {
         DBusMessage *m = NULL, *reply = NULL;
         DBusError error;
-        const char *mode, *base_target = "base.target";
+        const char *mode, *basic_target = "basic.target";
         DBusConnection *bus = NULL;
 
         assert(target);
@@ -65,7 +67,7 @@ static void start_target(const char *target, bool isolate) {
         /* Start these units only if we can replace base.target with it */
 
         if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_STRING, &base_target,
+                                      DBUS_TYPE_STRING, &basic_target,
                                       DBUS_TYPE_STRING, &target,
                                       DBUS_TYPE_STRING, &mode,
                                       DBUS_TYPE_INVALID)) {
@@ -74,7 +76,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;
         }
 
@@ -164,6 +171,7 @@ int main(int argc, char *argv[]) {
                 root_directory = false;
         } else {
                 struct stat st;
+                struct timespec times[2];
 
                 /* Find root device */
 
@@ -176,6 +184,14 @@ int main(int argc, char *argv[]) {
                 if (major(st.st_dev) == 0)
                         return 0;
 
+                /* check if we are already writable */
+                times[0] = st.st_atim;
+                times[1] = st.st_mtim;
+                if (utimensat(AT_FDCWD, "/", times, 0) == 0) {
+                        log_info("Root directory is writable, skipping check.");
+                        return 0;
+                }
+
                 if (!(udev = udev_new())) {
                         log_error("Out of memory");
                         goto finish;
@@ -197,7 +213,7 @@ int main(int argc, char *argv[]) {
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] = "-a";
         cmdline[i++] = "-T";
-        cmdline[i++] = "-C";
+        cmdline[i++] = "-l";
 
         if (!root_directory)
                 cmdline[i++] = "-M";