X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=0b572e59f5ab387a11cfb8e6746a093fae7abd8c;hb=8501384436b410cb9f5929ef6873c59fac6254be;hp=c2e1c741d571382ba7f593986cd1bb0e57a96161;hpb=e375825da0cbdbf3be755c277f9c0dec35b41a09;p=elogind.git diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index c2e1c741d..0b572e59f 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -4,6 +4,7 @@ This file is part of systemd. Copyright 2010 Lennart Poettering + Copyright 2014 Holger Hans Peter Freyther systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -37,10 +38,12 @@ #include "bus-errors.h" #include "fileio.h" #include "udev-util.h" +#include "path-util.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; @@ -72,43 +75,47 @@ static void start_target(const char *target) { log_error("Failed to start unit: %s", bus_error_message(&error, -r)); } -static int parse_proc_cmdline(void) { - char *line, *w, *state; - size_t l; - int r; - - r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) - return 0; +static int parse_proc_cmdline_item(const char *key, const char *value) { - FOREACH_WORD_QUOTED(w, l, line, state) { + if (streq(key, "fsck.mode") && value) { - if (strneq(w, "fsck.mode=auto", l)) + if (streq(value, "auto")) arg_force = arg_skip = false; - else if (strneq(w, "fsck.mode=force", l)) + else if (streq(value, "force")) arg_force = true; - else if (strneq(w, "fsck.mode=skip", l)) + else if (streq(value, "skip")) arg_skip = true; - else if (startswith(w, "fsck")) - log_warning("Invalid fsck parameter. Ignoring."); + else + log_warning("Invalid fsck.mode= parameter '%s'. Ignoring.", value); + + } else if (streq(key, "fsck.repair") && value) { + + if (streq(value, "preen")) + arg_repair = "-a"; + else if (streq(value, "yes")) + arg_repair = "-y"; + else if (streq(value, "no")) + arg_repair = "-n"; + else + log_warning("Invalid fsck.repair= parameter '%s'. Ignoring.", value); + } + #ifdef HAVE_SYSV_COMPAT - else if (strneq(w, "fastboot", l)) { - log_error("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line."); - arg_skip = true; - } else if (strneq(w, "forcefsck", l)) { - log_error("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line."); - arg_force = true; - } -#endif + 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; } +#endif - free(line); return 0; } 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."); @@ -151,11 +158,11 @@ static int process_progress(int fd) { f = fdopen(fd, "r"); if (!f) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } - console = fopen("/dev/console", "w"); + console = fopen("/dev/console", "we"); if (!console) return -ENOMEM; @@ -212,10 +219,11 @@ int main(int argc, char *argv[]) { siginfo_t status; _cleanup_udev_unref_ struct udev *udev = NULL; _cleanup_udev_device_unref_ struct udev_device *udev_device = NULL; - const char *device; + const char *device, *type; bool root_directory; int progress_pipe[2] = { -1, -1 }; char dash_c[2+10+1]; + struct stat st; if (argc > 2) { log_error("This program expects one or no arguments."); @@ -228,17 +236,33 @@ int main(int argc, char *argv[]) { umask(0022); - parse_proc_cmdline(); + parse_proc_cmdline(parse_proc_cmdline_item); test_files(); if (!arg_force && arg_skip) return 0; + udev = udev_new(); + if (!udev) { + log_oom(); + return EXIT_FAILURE; + } + if (argc > 1) { device = argv[1]; root_directory = false; + + if (stat(device, &st) < 0) { + log_error("Failed to stat '%s': %m", device); + return EXIT_FAILURE; + } + + udev_device = udev_device_new_from_devnum(udev, 'b', st.st_rdev); + if (!udev_device) { + log_error("Failed to detect device %s", device); + return EXIT_FAILURE; + } } else { - struct stat st; struct timespec times[2]; /* Find root device */ @@ -260,12 +284,6 @@ int main(int argc, char *argv[]) { return EXIT_SUCCESS; } - udev = udev_new(); - if (!udev) { - log_oom(); - return EXIT_FAILURE; - } - udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev); if (!udev_device) { log_error("Failed to detect root device."); @@ -281,6 +299,20 @@ int main(int argc, char *argv[]) { root_directory = true; } + 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 on %s", + type, device); + return EXIT_SUCCESS; + } else + log_warning("fsck.%s cannot be used for %s: %s", + type, device, strerror(-r)); + } + } + if (arg_show_progress) if (pipe(progress_pipe) < 0) { log_error("pipe(): %m"); @@ -288,9 +320,20 @@ int main(int argc, char *argv[]) { } cmdline[i++] = "/sbin/fsck"; - cmdline[i++] = "-a"; + cmdline[i++] = arg_repair; cmdline[i++] = "-T"; - cmdline[i++] = "-l"; + + /* + * Disable locking which conflict with udev's event + * ownershipi, until util-linux moves the flock + * synchronization file which prevents multiple fsck running + * on the same rotationg media, from the disk device + * node to a privately owned regular file. + * + * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5 + * + * cmdline[i++] = "-l"; + */ if (!root_directory) cmdline[i++] = "-M"; @@ -314,15 +357,12 @@ int main(int argc, char *argv[]) { } else if (pid == 0) { /* Child */ if (progress_pipe[0] >= 0) - close_nointr_nofail(progress_pipe[0]); + safe_close(progress_pipe[0]); execv(cmdline[0], (char**) cmdline); _exit(8); /* Operational error */ } - if (progress_pipe[1] >= 0) { - close_nointr_nofail(progress_pipe[1]); - progress_pipe[1] = -1; - } + progress_pipe[1] = safe_close(progress_pipe[1]); if (progress_pipe[0] >= 0) { process_progress(progress_pipe[0]); @@ -362,7 +402,7 @@ int main(int argc, char *argv[]) { touch("/run/systemd/quotacheck"); finish: - close_pipe(progress_pipe); + safe_close_pair(progress_pipe); return r; }