X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck.c;h=bfa35f2e56958a5f28c89e5b7be6c09142574227;hp=702f22c95defa5d37b21833e2f779aad002033f5;hb=70f12d37087721089a150fad985f0dca0f8af277;hpb=3e33a44a01078ea0699dca160b93f0399fbc994b

diff --git a/src/fsck.c b/src/fsck.c
index 702f22c95..bfa35f2e5 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -25,12 +25,13 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include <libudev.h>
 #include <dbus/dbus.h>
 
 #include "util.h"
-#include "ac-power.h"
 #include "dbus-common.h"
 #include "special.h"
+#include "bus-errors.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;
@@ -38,7 +39,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;
+        const char *mode, *basic_target = "basic.target";
         DBusConnection *bus = NULL;
 
         assert(target);
@@ -57,12 +58,15 @@ static void start_target(const char *target, bool isolate) {
 
         log_debug("Running request %s/start/%s", target, mode);
 
-        if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) {
+        if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnitReplace"))) {
                 log_error("Could not allocate message.");
                 goto finish;
         }
 
+        /* Start these units only if we can replace base.target with it */
+
         if (!dbus_message_append_args(m,
+                                      DBUS_TYPE_STRING, &basic_target,
                                       DBUS_TYPE_STRING, &target,
                                       DBUS_TYPE_STRING, &mode,
                                       DBUS_TYPE_INVALID)) {
@@ -71,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;
         }
 
@@ -132,13 +141,17 @@ static void test_files(void) {
 }
 
 int main(int argc, char *argv[]) {
-        static const char * cmdline[7];
+        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 exactly one argument.");
+        if (argc > 2) {
+                log_error("This program expects one or no arguments.");
                 return EXIT_FAILURE;
         }
 
@@ -149,26 +162,55 @@ int main(int argc, char *argv[]) {
         parse_proc_cmdline();
         test_files();
 
-        if (!arg_force) {
-                if (arg_skip)
-                        return 0;
+        if (!arg_force && arg_skip)
+                return 0;
+
+        if (argc > 1) {
+                device = argv[1];
+                root_directory = false;
+        } else {
+                struct stat st;
 
-                /* FIXME: only execute necessary fsck's if no AC power present */
-                if (on_ac_power() == 0) {
-                        log_info("Running on battery power, skipping file system check.");
+                /* Find root device */
+
+                if (stat("/", &st) < 0) {
+                        log_error("Failed to stat() the root directory: %m");
+                        goto finish;
+                }
+
+                /* Virtual root devices don't need an fsck */
+                if (major(st.st_dev) == 0)
                         return 0;
+
+                if (!(udev = udev_new())) {
+                        log_error("Out of memory");
+                        goto finish;
+                }
+
+                if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev))) {
+                        log_error("Failed to detect root device.");
+                        goto finish;
                 }
+
+                if (!(device = udev_device_get_devnode(udev_device))) {
+                        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";
+
+        if (!root_directory)
+                cmdline[i++] = "-M";
 
         if (arg_force)
                 cmdline[i++] = "-f";
 
-        cmdline[i++] = argv[1];
+        cmdline[i++] = device;
         cmdline[i++] = NULL;
 
         if ((pid = fork()) < 0) {
@@ -185,24 +227,16 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if (status.si_code == CLD_KILLED ||
-            status.si_code == CLD_DUMPED) {
-                log_error("fsck terminated by signal %s.", signal_to_string(status.si_status));
-                goto finish;
+        if (status.si_code != CLD_EXITED || (status.si_status & ~1)) {
 
-        } else if (status.si_code != CLD_EXITED) {
-                log_error("fsck failed due to unknown reason.");
-                goto finish;
-        }
-
-        if (status.si_status & ~1) {
-
-                if (access("/dev/.systemd/late-fsck", F_OK) >= 0) {
+                if (status.si_code == CLD_KILLED || status.si_code == CLD_DUMPED)
+                        log_error("fsck terminated by signal %s.", signal_to_string(status.si_status));
+                else if (status.si_code == CLD_EXITED)
                         log_error("fsck failed with error code %i.", status.si_status);
-                        goto finish;
-                }
+                else
+                        log_error("fsck failed due to unknown reason.");
 
-                if (status.si_status & 2)
+                if (status.si_code == CLD_EXITED && status.si_status & 2)
                         /* System should be rebooted. */
                         start_target(SPECIAL_REBOOT_TARGET, false);
                 else
@@ -212,9 +246,15 @@ int main(int argc, char *argv[]) {
         } else
                 r = EXIT_SUCCESS;
 
-        if (status.si_status & 1)
+        if (status.si_code == CLD_EXITED && (status.si_status & 1))
                 touch("/dev/.systemd/quotacheck");
 
 finish:
+        if (udev_device)
+                udev_device_unref(udev_device);
+
+        if (udev)
+                udev_unref(udev);
+
         return r;
 }