X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck.c;h=dfaf221b3e1bb598e2e0ec42d1c0325cb58a93b7;hp=eca2212f476de8dde727097b3f0402e6d4ec4014;hb=c8bc83f5eac49f083ae53d965577118c1b5c1116;hpb=6e8ebcc7de321bac0ba494365a85a19040654405

diff --git a/src/fsck.c b/src/fsck.c
index eca2212f4..dfaf221b3 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;
         }
 
@@ -135,13 +142,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,10 +166,12 @@ 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;
+                struct timespec times[2];
 
                 /* Find root device */
 
@@ -174,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;
@@ -188,13 +206,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";