X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck.c;h=d7d4839f1c9d81f1c3cda869b4c82f7143a28f81;hp=0e1508972e99a6f74158d14b875ff9e0b5b8f563;hb=27d340c772fb1b251085dba7bd5420484f7c5892;hpb=a9e1f5ec36049dca715f83b2c6fc44a019e2da53 diff --git a/src/fsck.c b/src/fsck.c index 0e1508972..d7d4839f1 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include @@ -31,14 +33,16 @@ #include "util.h" #include "dbus-common.h" #include "special.h" +#include "bus-errors.h" static bool arg_skip = false; static bool arg_force = false; +static bool arg_show_progress = 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 +59,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 +69,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 +78,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; } @@ -99,6 +108,9 @@ static int parse_proc_cmdline(void) { int r; size_t l; + if (detect_container(NULL) > 0) + return 0; + if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) { log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); return 0; @@ -114,7 +126,7 @@ static int parse_proc_cmdline(void) { arg_skip = true; else if (startswith(w, "fsck.mode")) log_warning("Invalid fsck.mode= parameter. Ignoring."); -#ifdef TARGET_FEDORA +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) else if (strneq(w, "fastboot", l)) arg_skip = true; else if (strneq(w, "forcefsck", l)) @@ -132,36 +144,136 @@ static void test_files(void) { if (access("/forcefsck", F_OK) >= 0) arg_force = true; + + if (access("/run/systemd/show-status", F_OK) >= 0 || plymouth_running()) + arg_show_progress = true; +} + +static double percent(int pass, unsigned long cur, unsigned long max) { + /* Values stolen from e2fsck */ + + static const int pass_table[] = { + 0, 70, 90, 92, 95, 100 + }; + + if (pass <= 0) + return 0.0; + + if ((unsigned) pass >= ELEMENTSOF(pass_table) || max == 0) + return 100.0; + + return (double) pass_table[pass-1] + + ((double) pass_table[pass] - (double) pass_table[pass-1]) * + (double) cur / (double) max; +} + +static int process_progress(int fd) { + FILE *f, *console; + usec_t last = 0; + bool locked = false; + int clear = 0; + + f = fdopen(fd, "r"); + if (!f) { + close_nointr_nofail(fd); + return -errno; + } + + console = fopen("/dev/console", "w"); + if (!console) { + fclose(f); + return -ENOMEM; + } + + while (!feof(f)) { + int pass, m; + unsigned long cur, max; + char *device; + double p; + usec_t t; + + if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4) + break; + + /* Only show one progress counter at max */ + if (!locked) { + if (flock(fileno(console), LOCK_EX|LOCK_NB) < 0) { + free(device); + continue; + } + + locked = true; + } + + /* Only update once every 50ms */ + t = now(CLOCK_MONOTONIC); + if (last + 50 * USEC_PER_MSEC > t) { + free(device); + continue; + } + + last = t; + + p = percent(pass, cur, max); + fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m); + fflush(console); + + free(device); + + if (m > clear) + clear = m; + } + + if (clear > 0) { + unsigned j; + + fputc('\r', console); + for (j = 0; j < (unsigned) clear; j++) + fputc(' ', console); + fputc('\r', console); + fflush(console); + } + + fclose(f); + fclose(console); + return 0; } int main(int argc, char *argv[]) { - const char *cmdline[7]; + const char *cmdline[9]; 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; + int progress_pipe[2] = { -1, -1 }; + char dash_c[2+10+1]; if (argc > 2) { log_error("This program expects one or no arguments."); return EXIT_FAILURE; } - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open(); + umask(0022); + parse_proc_cmdline(); test_files(); 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 +286,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,29 +308,60 @@ int main(int argc, char *argv[]) { log_error("Failed to detect device node of root directory."); goto finish; } + + root_directory = true; } + if (arg_show_progress) + if (pipe(progress_pipe) < 0) { + log_error("pipe(): %m"); + goto finish; + } + 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"; + if (progress_pipe[1] >= 0) { + snprintf(dash_c, sizeof(dash_c), "-C%i", progress_pipe[1]); + char_array_0(dash_c); + cmdline[i++] = dash_c; + } + cmdline[i++] = device; cmdline[i++] = NULL; - if ((pid = fork()) < 0) { + pid = fork(); + if (pid < 0) { log_error("fork(): %m"); goto finish; } else if (pid == 0) { /* Child */ + if (progress_pipe[0] >= 0) + close_nointr_nofail(progress_pipe[0]); execv(cmdline[0], (char**) cmdline); _exit(8); /* Operational error */ } - if ((q = wait_for_terminate(pid, &status)) < 0) { + if (progress_pipe[1] >= 0) { + close_nointr_nofail(progress_pipe[1]); + progress_pipe[1] = -1; + } + + if (progress_pipe[0] >= 0) { + process_progress(progress_pipe[0]); + progress_pipe[0] = -1; + } + + q = wait_for_terminate(pid, &status); + if (q < 0) { log_error("waitid(): %s", strerror(-q)); goto finish; } @@ -224,18 +375,22 @@ int main(int argc, char *argv[]) { else log_error("fsck failed due to unknown reason."); - if (status.si_code == CLD_EXITED && 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_code == CLD_EXITED && (status.si_status & 1)) - touch("/dev/.systemd/quotacheck"); + touch("/run/systemd/quotacheck"); finish: if (udev_device) @@ -244,5 +399,7 @@ finish: if (udev) udev_unref(udev); + close_pipe(progress_pipe); + return r; }