X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck.c;h=7855f3ac071cd0d094065deab2ce135f36bb56ff;hp=b0c3620c8c3d3ddb89a1cd6eabad5ab65680252a;hb=3414abee0dfadd4a7d9dcca3f46025037010488e;hpb=90bb85e140a238ce76f05c473e2eb68f147671f3 diff --git a/src/fsck.c b/src/fsck.c index b0c3620c8..7855f3ac0 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -24,13 +24,15 @@ #include #include #include +#include +#include #include #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 +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); @@ -55,7 +57,7 @@ static void start_target(const char *target, bool isolate) { else mode = "replace"; - log_debug("Running request %s/start/%s", target, mode); + log_info("Running request %s/start/%s", target, mode); if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnitReplace"))) { log_error("Could not allocate message."); @@ -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,17 @@ static void test_files(void) { } int main(int argc, char *argv[]) { - static const char * cmdline[7]; + const char *cmdline[8]; 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; } @@ -152,26 +163,65 @@ int main(int argc, char *argv[]) { parse_proc_cmdline(); test_files(); - if (!arg_force) { - if (arg_skip) + if (!arg_force && arg_skip) + return 0; + + if (argc > 1) { + device = argv[1]; + root_directory = false; + } else { + struct stat st; + struct timespec times[2]; + + /* 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; - /* 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."); + /* 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; + } + + 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"; + cmdline[i++] = "-l"; + + 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) { @@ -188,32 +238,38 @@ 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; - - } else if (status.si_code != CLD_EXITED) { - log_error("fsck failed due to unknown reason."); - goto finish; - } + if (status.si_code != CLD_EXITED || (status.si_status & ~1)) { - if (status.si_status & ~1) { - log_error("fsck failed with error code %i.", status.si_status); + 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); + else + log_error("fsck failed due to unknown reason."); - if (status.si_status & 2) + if (status.si_code == CLD_EXITED && (status.si_status & 2) && root_directory) /* System should be rebooted. */ start_target(SPECIAL_REBOOT_TARGET, false); - else + else if (status.si_code == CLD_EXITED && (status.si_status & 6)) /* Some other problem */ start_target(SPECIAL_EMERGENCY_TARGET, true); + else { + r = EXIT_SUCCESS; + log_warning("Ignoring error."); + } } 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; }