X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=a4a15da1bf630e8a050f422cfd948f3c9904172c;hp=594f21e070ee90846984e1b954bc13529e887f1a;hb=576a13eaf6491fdbebc817ef613963ac24cfb6b8;hpb=f1f0198cb61a3398557cc9ec596e1e90ac731ed3 diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 594f21e07..a4a15da1b 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -22,11 +22,11 @@ #include #include -#include #include #include #include #include +#include #include "sd-bus.h" #include "libudev.h" @@ -35,26 +35,26 @@ #include "special.h" #include "bus-util.h" #include "bus-error.h" -#include "bus-errors.h" -#include "fileio.h" +#include "bus-common-errors.h" #include "udev-util.h" #include "path-util.h" +#include "socket-util.h" +#include "fsckd/fsckd.h" static bool arg_skip = false; static bool arg_force = false; -static bool arg_show_progress = false; static const char *arg_repair = "-a"; static void start_target(const char *target) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; assert(target); r = bus_open_system_systemd(&bus); if (r < 0) { - log_error("Failed to get D-Bus connection: %s", strerror(-r)); + log_error_errno(r, "Failed to get D-Bus connection: %m"); return; } @@ -86,7 +86,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { else if (streq(value, "skip")) arg_skip = true; else - log_warning("Invalid fsck.mode= parameter. Ignoring."); + log_warning("Invalid fsck.mode= parameter '%s'. Ignoring.", value); + } else if (streq(key, "fsck.repair") && value) { if (streq(value, "preen")) @@ -96,13 +97,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { else if (streq(value, "no")) arg_repair = "-n"; else - log_warning("Invalid fsck.repair= parameter. Ignoring."); - } else if (startswith(key, "fsck.")) - log_warning("Invalid fsck parameter. Ignoring."); + log_warning("Invalid fsck.repair= parameter '%s'. Ignoring.", value); + } + #ifdef HAVE_SYSV_COMPAT else if (streq(key, "fastboot") && !value) { log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line."); arg_skip = true; + } else if (streq(key, "forcefsck") && !value) { log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line."); arg_force = true; @@ -113,6 +115,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { } static void test_files(void) { + #ifdef HAVE_SYSV_COMPAT if (access("/fastboot", F_OK) >= 0) { log_error("Please pass 'fsck.mode=skip' on the kernel command line rather than creating /fastboot on the root file system."); @@ -125,62 +128,40 @@ static void test_files(void) { } #endif - 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 +static int process_progress(int fd, pid_t fsck_pid, dev_t device_num) { + _cleanup_fclose_ FILE *f = NULL; + usec_t last = 0; + _cleanup_close_ int fsckd_fd = -1; + static const union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + .un.sun_path = FSCKD_SOCKET_PATH, }; - 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) { - _cleanup_fclose_ FILE *console = NULL, *f = NULL; - usec_t last = 0; - bool locked = false; - int clear = 0; + fsckd_fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); + if (fsckd_fd < 0) + return log_warning_errno(errno, "Cannot open fsckd socket, we won't report fsck progress: %m"); + if (connect(fsckd_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) + return log_warning_errno(errno, "Cannot connect to fsckd socket, we won't report fsck progress: %m"); f = fdopen(fd, "r"); - if (!f) { - safe_close(fd); - return -errno; - } - - console = fopen("/dev/console", "we"); - if (!console) - return -ENOMEM; + if (!f) + return log_warning_errno(errno, "Cannot connect to fsck, we won't report fsck progress: %m"); while (!feof(f)) { - int pass, m; - unsigned long cur, max; - _cleanup_free_ char *device = NULL; - double p; + int pass; + size_t buflen; + size_t cur, max; + ssize_t r; usec_t t; + _cleanup_free_ char *device = NULL; + FsckProgress progress; + FsckdMessage fsckd_message; 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) - continue; - - locked = true; - } - /* Only update once every 50ms */ t = now(CLOCK_MONOTONIC); if (last + 50 * USEC_PER_MSEC > t) @@ -188,22 +169,25 @@ static int process_progress(int fd) { last = t; - p = percent(pass, cur, max); - fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m); - fflush(console); - - 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); + /* send progress to fsckd */ + progress.devnum = device_num; + progress.cur = cur; + progress.max = max; + progress.pass = pass; + + r = send(fsckd_fd, &progress, sizeof(FsckProgress), 0); + if (r < 0 || (size_t) r < sizeof(FsckProgress)) + log_warning_errno(errno, "Cannot communicate fsck progress to fsckd: %m"); + + /* get fsckd requests, only read when we have coherent size data */ + r = ioctl(fsckd_fd, FIONREAD, &buflen); + if (r == 0 && (size_t) buflen >= sizeof(FsckdMessage)) { + r = recv(fsckd_fd, &fsckd_message, sizeof(FsckdMessage), 0); + if (r > 0 && fsckd_message.cancel == 1) { + log_info("Request to cancel fsck from fsckd"); + kill(fsck_pid, SIGTERM); + } + } } return 0; @@ -213,13 +197,14 @@ int main(int argc, char *argv[]) { const char *cmdline[9]; int i = 0, r = EXIT_FAILURE, q; pid_t pid; + int progress_rc; siginfo_t status; _cleanup_udev_unref_ struct udev *udev = NULL; _cleanup_udev_device_unref_ struct udev_device *udev_device = NULL; const char *device, *type; bool root_directory; int progress_pipe[2] = { -1, -1 }; - char dash_c[2+10+1]; + char dash_c[sizeof("-C")-1 + DECIMAL_STR_MAX(int) + 1]; struct stat st; if (argc > 2) { @@ -233,7 +218,10 @@ int main(int argc, char *argv[]) { umask(0022); - parse_proc_cmdline(parse_proc_cmdline_item); + q = parse_proc_cmdline(parse_proc_cmdline_item); + if (q < 0) + log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m"); + test_files(); if (!arg_force && arg_skip) @@ -250,7 +238,7 @@ int main(int argc, char *argv[]) { root_directory = false; if (stat(device, &st) < 0) { - log_error("Failed to stat '%s': %m", device); + log_error_errno(errno, "Failed to stat '%s': %m", device); return EXIT_FAILURE; } @@ -265,7 +253,7 @@ int main(int argc, char *argv[]) { /* Find root device */ if (stat("/", &st) < 0) { - log_error("Failed to stat() the root directory: %m"); + log_error_errno(errno, "Failed to stat() the root directory: %m"); return EXIT_FAILURE; } @@ -299,24 +287,27 @@ int main(int argc, char *argv[]) { type = udev_device_get_property_value(udev_device, "ID_FS_TYPE"); if (type) { r = fsck_exists(type); - if (r < 0) { - if (r == -ENOENT) { - log_info("fsck.%s doesn't exist, not checking file system.", type); - return EXIT_SUCCESS; - } else - log_warning("fsck.%s cannot be used: %s", type, strerror(-r)); - } + if (r == -ENOENT) { + log_info("fsck.%s doesn't exist, not checking file system on %s", type, device); + return EXIT_SUCCESS; + } else if (r < 0) + log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device); } - if (arg_show_progress) - if (pipe(progress_pipe) < 0) { - log_error("pipe(): %m"); - return EXIT_FAILURE; - } + if (pipe(progress_pipe) < 0) { + log_error_errno(errno, "pipe(): %m"); + return EXIT_FAILURE; + } cmdline[i++] = "/sbin/fsck"; cmdline[i++] = arg_repair; cmdline[i++] = "-T"; + + /* + * Since util-linux v2.25 fsck uses /run/fsck/.lock files. + * The previous versions use flock for the device and conflict with + * udevd, see https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5 + */ cmdline[i++] = "-l"; if (!root_directory) @@ -325,47 +316,42 @@ int main(int argc, char *argv[]) { 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; - } + xsprintf(dash_c, "-C%i", progress_pipe[1]); + cmdline[i++] = dash_c; cmdline[i++] = device; cmdline[i++] = NULL; pid = fork(); if (pid < 0) { - log_error("fork(): %m"); + log_error_errno(errno, "fork(): %m"); goto finish; } else if (pid == 0) { /* Child */ - if (progress_pipe[0] >= 0) - safe_close(progress_pipe[0]); + safe_close(progress_pipe[0]); execv(cmdline[0], (char**) cmdline); _exit(8); /* Operational error */ } progress_pipe[1] = safe_close(progress_pipe[1]); - if (progress_pipe[0] >= 0) { - process_progress(progress_pipe[0]); - progress_pipe[0] = -1; - } + progress_rc = process_progress(progress_pipe[0], pid, st.st_rdev); + progress_pipe[0] = -1; q = wait_for_terminate(pid, &status); if (q < 0) { - log_error("waitid(): %s", strerror(-q)); + log_error_errno(q, "waitid(): %m"); goto finish; } - if (status.si_code != CLD_EXITED || (status.si_status & ~1)) { + if (status.si_code != CLD_EXITED || (status.si_status & ~1) || progress_rc != 0) { - if (status.si_code == CLD_KILLED || status.si_code == CLD_DUMPED) + /* cancel will kill fsck (but process_progress returns 0) */ + if ((progress_rc != 0 && 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 + else if (progress_rc != 0) log_error("fsck failed due to unknown reason."); if (status.si_code == CLD_EXITED && (status.si_status & 2) && root_directory) @@ -376,7 +362,8 @@ int main(int argc, char *argv[]) { start_target(SPECIAL_EMERGENCY_TARGET); else { r = EXIT_SUCCESS; - log_warning("Ignoring error."); + if (progress_rc != 0) + log_warning("Ignoring error."); } } else