diff options
-rw-r--r-- | src/fsck/fsck.c | 13 | ||||
-rw-r--r-- | units/local-fs.target | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index f692b3a8d3..f298cf7b9a 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -41,10 +41,10 @@ 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); @@ -56,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"))) { @@ -389,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."); diff --git a/units/local-fs.target b/units/local-fs.target index ee02e4e988..18c3d74f18 100644 --- a/units/local-fs.target +++ b/units/local-fs.target @@ -10,4 +10,4 @@ Description=Local File Systems Documentation=man:systemd.special(7) After=local-fs-pre.target OnFailure=emergency.target -OnFailureIsolate=yes +OnFailureIsolate=no |