X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=3164d6899c6c6e84888160318206828522c55b31;hp=058f34d64fdc12b83557fc9f14800ab90db34a6a;hb=0f8bd8debb0ff7f5bff7738841931f6c41e40bc1;hpb=0d0f0c50d3a1d90f03972a6abb82e6413daaa583 diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 058f34d64..3164d6899 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -27,81 +27,55 @@ #include #include -#include -#include +#include "sd-bus.h" +#include "libudev.h" #include "util.h" -#include "dbus-common.h" #include "special.h" +#include "bus-util.h" +#include "bus-error.h" #include "bus-errors.h" #include "virt.h" +#include "fileio.h" +#include "udev-util.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, *basic_target = "basic.target"; - DBusConnection *bus = NULL; +static void start_target(const char *target) { + _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_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("Failed to get D-Bus connection: %s", strerror(-r)); + 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))) { + r = sd_bus_call_method(bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartUnitReplace", + &error, + NULL, + "sss", "basic.target", target, "replace"); + if (r < 0) { /* 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); + if (!sd_bus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB)) + log_error("Failed to start unit: %s", bus_error_message(&error, -r)); } - dbus_error_free(&error); + return; } static int parse_proc_cmdline(void) { @@ -128,11 +102,14 @@ static int parse_proc_cmdline(void) { arg_skip = true; else if (startswith(w, "fsck")) log_warning("Invalid fsck parameter. Ignoring."); -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) - else if (strneq(w, "fastboot", l)) +#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)) + } 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 } @@ -141,11 +118,17 @@ static int parse_proc_cmdline(void) { } static void test_files(void) { - if (access("/fastboot", F_OK) >= 0) +#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."); arg_skip = true; + } - if (access("/forcefsck", F_OK) >= 0) + if (access("/forcefsck", F_OK) >= 0) { + log_error("Please pass 'fsck.mode=force' on the kernel command line rather than creating /forcefsck on the root file system."); arg_force = true; + } +#endif if (access("/run/systemd/show-status", F_OK) >= 0 || plymouth_running()) arg_show_progress = true; @@ -246,8 +229,8 @@ int main(int argc, char *argv[]) { int i = 0, r = EXIT_FAILURE, q; pid_t pid; siginfo_t status; - struct udev *udev = NULL; - struct udev_device *udev_device = NULL; + _cleanup_udev_unref_ struct udev *udev = NULL; + _cleanup_udev_device_unref_ struct udev_device *udev_device = NULL; const char *device; bool root_directory; int progress_pipe[2] = { -1, -1 }; @@ -379,10 +362,10 @@ int main(int argc, char *argv[]) { if (status.si_code == CLD_EXITED && (status.si_status & 2) && root_directory) /* System should be rebooted. */ - start_target(SPECIAL_REBOOT_TARGET, false); + start_target(SPECIAL_REBOOT_TARGET); else if (status.si_code == CLD_EXITED && (status.si_status & 6)) /* Some other problem */ - start_target(SPECIAL_EMERGENCY_TARGET, true); + start_target(SPECIAL_EMERGENCY_TARGET); else { r = EXIT_SUCCESS; log_warning("Ignoring error."); @@ -395,12 +378,6 @@ int main(int argc, char *argv[]) { touch("/run/systemd/quotacheck"); finish: - if (udev_device) - udev_device_unref(udev_device); - - if (udev) - udev_unref(udev); - close_pipe(progress_pipe); return r;