X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=f298cf7b9ab82d2f5f00c9a655d34942e94d9b4b;hb=903a0b07e003c1ad976dc30e98b69a70778007ad;hp=f5d38ad261192dccd59355144fecf54655ac714e;hpb=32f992a514949b42550b97cadb3bb5499b54ca49;p=elogind.git diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index f5d38ad26..f298cf7b9 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -35,15 +35,16 @@ #include "special.h" #include "bus-errors.h" #include "virt.h" +#include "fileio.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) { +static void start_target(const char *target) { DBusMessage *m = NULL, *reply = NULL; DBusError error; - const char *mode, *basic_target = "basic.target"; + const char *mode = "replace", *basic_target = "basic.target"; DBusConnection *bus = NULL; assert(target); @@ -55,11 +56,6 @@ static void start_target(const char *target, bool isolate) { goto finish; } - 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"))) { @@ -388,10 +384,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.");