X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=30254b6680c22e7f27257365e3bbadafc6f24e59;hb=ce30c8dcb41dfe9264f79f30c7f51c0e74576638;hp=f5d38ad261192dccd59355144fecf54655ac714e;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=thirdparty%2Fsystemd.git diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index f5d38ad2611..30254b6680c 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 @@ -21,129 +22,121 @@ #include #include -#include #include #include #include #include +#include +#include -#include -#include +#include "sd-bus.h" +#include "sd-device.h" #include "util.h" -#include "dbus-common.h" +#include "process-util.h" +#include "signal-util.h" #include "special.h" -#include "bus-errors.h" -#include "virt.h" +#include "bus-util.h" +#include "bus-error.h" +#include "bus-common-errors.h" +#include "device-util.h" +#include "path-util.h" +#include "socket-util.h" + +/* exit codes as defined in fsck(8) */ +enum { + FSCK_SUCCESS = 0, + FSCK_ERROR_CORRECTED = 1, + FSCK_SYSTEM_SHOULD_REBOOT = 2, + FSCK_ERRORS_LEFT_UNCORRECTED = 4, + FSCK_OPERATIONAL_ERROR = 8, + FSCK_USAGE_OR_SYNTAX_ERROR = 16, + FSCK_USER_CANCELLED = 32, + FSCK_SHARED_LIB_ERROR = 128, +}; 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, bool isolate) { - DBusMessage *m = NULL, *reply = NULL; - DBusError error; - const char *mode, *basic_target = "basic.target"; - DBusConnection *bus = NULL; +static void start_target(const char *target) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; + int r; assert(target); - dbus_error_init(&error); - - if (bus_connect(DBUS_BUS_SYSTEM, &bus, NULL, &error) < 0) { - log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); - goto finish; + r = bus_open_system_systemd(&bus); + if (r < 0) { + log_error_errno(r, "Failed to get D-Bus connection: %m"); + return; } - if (isolate) - mode = "isolate"; - else - mode = "replace"; - - 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."); - goto finish; - } + log_info("Running request %s/start/replace", target); /* 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)) { - log_error("Could not attach target and flag information to message."); - goto finish; - } - - if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - - /* Don't print a warning 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; - } - -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - if (bus) { - dbus_connection_flush(bus); - dbus_connection_close(bus); - dbus_connection_unref(bus); - } - - dbus_error_free(&error); + r = sd_bus_call_method(bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartUnitReplace", + &error, + NULL, + "sss", "basic.target", target, "replace"); + + /* Don't print a warning if we aren't called during startup */ + if (r < 0 && !sd_bus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB)) + log_error("Failed to start unit: %s", bus_error_message(&error, r)); } -static int parse_proc_cmdline(void) { - char *line, *w, *state; +static int parse_proc_cmdline_item(const char *key, const char *value) { int r; - size_t l; - if (detect_container(NULL) > 0) - return 0; + assert(key); - r = read_one_line_file("/proc/cmdline", &line); - if (r < 0) { - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - return 0; - } + if (streq(key, "fsck.mode") && value) { - FOREACH_WORD_QUOTED(w, l, line, state) { - - 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)) - arg_skip = true; - else if (startswith(w, "fsck")) - log_warning("Invalid fsck parameter. Ignoring."); -#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."); + else if (streq(value, "skip")) 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; + 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 { + r = parse_boolean(value); + if (r > 0) + arg_repair = "-y"; + else if (r == 0) + arg_repair = "-n"; + else + log_warning("Invalid fsck.repair= parameter '%s'. Ignoring.", value); } -#endif } - free(line); +#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; + } +#endif + 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."); @@ -156,8 +149,7 @@ static void test_files(void) { } #endif - if (access("/run/systemd/show-status", F_OK) >= 0 || plymouth_running()) - arg_show_progress = true; + arg_show_progress = access("/run/systemd/show-status", F_OK) >= 0; } static double percent(int pass, unsigned long cur, unsigned long max) { @@ -179,49 +171,57 @@ static double percent(int pass, unsigned long cur, unsigned long max) { } static int process_progress(int fd) { - FILE *f, *console; + _cleanup_fclose_ FILE *console = NULL, *f = NULL; usec_t last = 0; bool locked = false; - int clear = 0; + int clear = 0, r; - f = fdopen(fd, "r"); + /* No progress pipe to process? Then we are a NOP. */ + if (fd < 0) + return 0; + + f = fdopen(fd, "re"); if (!f) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } - console = fopen("/dev/console", "w"); - if (!console) { - fclose(f); + console = fopen("/dev/console", "we"); + if (!console) return -ENOMEM; - } - while (!feof(f)) { + for (;;) { int pass, m; unsigned long cur, max; - char *device; + _cleanup_free_ char *device = NULL; double p; usec_t t; - if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4) + if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4) { + + if (ferror(f)) + r = log_warning_errno(errno, "Failed to read from progress pipe: %m"); + else if (feof(f)) + r = 0; + else { + log_warning("Failed to parse progress pipe data"); + r = -EBADMSG; + } break; + } /* Only show one progress counter at max */ if (!locked) { - if (flock(fileno(console), LOCK_EX|LOCK_NB) < 0) { - free(device); + 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) { - free(device); + if (last + 50 * USEC_PER_MSEC > t) continue; - } last = t; @@ -229,8 +229,6 @@ static int process_progress(int fd) { fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m); fflush(console); - free(device); - if (m > clear) clear = m; } @@ -245,22 +243,40 @@ static int process_progress(int fd) { fflush(console); } - fclose(f); - fclose(console); - return 0; + return r; +} + +static int fsck_progress_socket(void) { + static const union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + .un.sun_path = "/run/systemd/fsck.progress", + }; + + int fd, r; + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd < 0) + return log_warning_errno(errno, "socket(): %m"); + + if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) { + r = log_full_errno(errno == ECONNREFUSED || errno == ENOENT ? LOG_DEBUG : LOG_WARNING, + errno, "Failed to connect to progress socket %s, ignoring: %m", sa.un.sun_path); + safe_close(fd); + return r; + } + + return fd; } int main(int argc, char *argv[]) { - 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; + _cleanup_close_pair_ int progress_pipe[2] = { -1, -1 }; + _cleanup_device_unref_ sd_device *dev = NULL; + const char *device, *type; bool root_directory; - int progress_pipe[2] = { -1, -1 }; - char dash_c[2+10+1]; + siginfo_t status; + struct stat st; + int r; + pid_t pid; if (argc > 2) { log_error("This program expects one or no arguments."); @@ -273,107 +289,164 @@ int main(int argc, char *argv[]) { umask(0022); - parse_proc_cmdline(); + r = parse_proc_cmdline(parse_proc_cmdline_item); + if (r < 0) + log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); + test_files(); - if (!arg_force && arg_skip) - return 0; + if (!arg_force && arg_skip) { + r = 0; + goto finish; + } if (argc > 1) { device = argv[1]; + + if (stat(device, &st) < 0) { + r = log_error_errno(errno, "Failed to stat %s: %m", device); + goto finish; + } + + if (!S_ISBLK(st.st_mode)) { + log_error("%s is not a block device.", device); + r = -EINVAL; + goto finish; + } + + r = sd_device_new_from_devnum(&dev, 'b', st.st_rdev); + if (r < 0) { + log_error_errno(r, "Failed to detect device %s: %m", device); + goto finish; + } + 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"); + r = log_error_errno(errno, "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 (major(st.st_dev) == 0) { + log_debug("Root directory is virtual or btrfs, skipping check."); + r = 0; + goto finish; + } /* 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_oom(); + r = 0; goto finish; } - if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev))) { - log_error("Failed to detect root device."); + r = sd_device_new_from_devnum(&dev, 'b', st.st_dev); + if (r < 0) { + log_error_errno(r, "Failed to detect root device: %m"); goto finish; } - if (!(device = udev_device_get_devnode(udev_device))) { - log_error("Failed to detect device node of root directory."); + r = sd_device_get_devname(dev, &device); + if (r < 0) { + log_error_errno(r, "Failed to detect device node of root directory: %m"); goto finish; } root_directory = true; } - if (arg_show_progress) + r = sd_device_get_property_value(dev, "ID_FS_TYPE", &type); + if (r >= 0) { + r = fsck_exists(type); + if (r == -ENOENT) { + log_info("fsck.%s doesn't exist, not checking file system on %s", type, device); + r = 0; + goto finish; + } else if (r < 0) + log_warning_errno(r, "Couldn't detect if fsck.%s may be used for %s: %m", type, device); + } + + if (arg_show_progress) { if (pipe(progress_pipe) < 0) { - log_error("pipe(): %m"); + r = log_error_errno(errno, "pipe(): %m"); goto finish; } - - cmdline[i++] = "/sbin/fsck"; - cmdline[i++] = "-a"; - cmdline[i++] = "-T"; - 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; - pid = fork(); if (pid < 0) { - log_error("fork(): %m"); + r = log_error_errno(errno, "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 (pid == 0) { + char dash_c[sizeof("-C")-1 + DECIMAL_STR_MAX(int) + 1]; + int progress_socket = -1; + const char *cmdline[9]; + int i = 0; - if (progress_pipe[1] >= 0) { - close_nointr_nofail(progress_pipe[1]); - progress_pipe[1] = -1; - } + /* Child */ + + (void) reset_all_signal_handlers(); + (void) reset_signal_mask(); + assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0); + + /* Close the reading side of the progress pipe */ + progress_pipe[0] = safe_close(progress_pipe[0]); + + /* Try to connect to a progress management daemon, if there is one */ + progress_socket = fsck_progress_socket(); + if (progress_socket >= 0) { + /* If this worked we close the progress pipe early, and just use the socket */ + progress_pipe[1] = safe_close(progress_pipe[1]); + xsprintf(dash_c, "-C%i", progress_socket); + } else if (progress_pipe[1] >= 0) { + /* Otherwise if we have the progress pipe to our own local handle, we use it */ + xsprintf(dash_c, "-C%i", progress_pipe[1]); + } else + dash_c[0] = 0; - if (progress_pipe[0] >= 0) { - process_progress(progress_pipe[0]); - progress_pipe[0] = -1; + 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) + cmdline[i++] = "-M"; + + if (arg_force) + cmdline[i++] = "-f"; + + if (!isempty(dash_c)) + cmdline[i++] = dash_c; + + cmdline[i++] = device; + cmdline[i++] = NULL; + + execv(cmdline[0], (char**) cmdline); + _exit(FSCK_OPERATIONAL_ERROR); } - q = wait_for_terminate(pid, &status); - if (q < 0) { - log_error("waitid(): %s", strerror(-q)); + progress_pipe[1] = safe_close(progress_pipe[1]); + (void) process_progress(progress_pipe[0]); + progress_pipe[0] = -1; + + r = wait_for_terminate(pid, &status); + if (r < 0) { + log_error_errno(r, "waitid(): %m"); goto finish; } @@ -386,31 +459,25 @@ 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) && root_directory) + r = -EINVAL; + + if (status.si_code == CLD_EXITED && (status.si_status & FSCK_SYSTEM_SHOULD_REBOOT) && root_directory) /* System should be rebooted. */ - start_target(SPECIAL_REBOOT_TARGET, false); - else if (status.si_code == CLD_EXITED && (status.si_status & 6)) + start_target(SPECIAL_REBOOT_TARGET); + else if (status.si_code == CLD_EXITED && (status.si_status & (FSCK_SYSTEM_SHOULD_REBOOT | FSCK_ERRORS_LEFT_UNCORRECTED))) /* Some other problem */ - start_target(SPECIAL_EMERGENCY_TARGET, true); + start_target(SPECIAL_EMERGENCY_TARGET); else { - r = EXIT_SUCCESS; log_warning("Ignoring error."); + r = 0; } } else - r = EXIT_SUCCESS; + r = 0; - if (status.si_code == CLD_EXITED && (status.si_status & 1)) - touch("/run/systemd/quotacheck"); + if (status.si_code == CLD_EXITED && (status.si_status & FSCK_ERROR_CORRECTED)) + (void) touch("/run/systemd/quotacheck"); finish: - if (udev_device) - udev_device_unref(udev_device); - - if (udev) - udev_unref(udev); - - close_pipe(progress_pipe); - - return r; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }