summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fixme4
-rw-r--r--src/main.c9
2 files changed, 8 insertions, 5 deletions
diff --git a/fixme b/fixme
index de3543e7b2..077f85dd0d 100644
--- a/fixme
+++ b/fixme
@@ -1,9 +1,5 @@
* systemd.log_level=debug should overwrite 'quiet' ?
-* implicit 'default.target' ?
- systemd currently fails to boot when the link is dangling, like
- after the move of the runlevel targets from /etc to /lib
-
* dot output for --test showing the 'initial transaction'
* check 'disable'
diff --git a/src/main.c b/src/main.c
index b0e1c2230b..2c91fe4578 100644
--- a/src/main.c
+++ b/src/main.c
@@ -851,7 +851,6 @@ fail:
int main(int argc, char *argv[]) {
Manager *m = NULL;
- Unit *target = NULL;
int r, retval = 1;
FDSet *fds = NULL;
bool reexecute = false;
@@ -1004,6 +1003,7 @@ int main(int argc, char *argv[]) {
serialization = NULL;
} else {
DBusError error;
+ Unit *target = NULL;
dbus_error_init(&error);
@@ -1012,12 +1012,19 @@ int main(int argc, char *argv[]) {
if ((r = manager_load_unit(m, arg_default_unit, NULL, &error, &target)) < 0) {
log_error("Failed to load default target: %s", bus_error(&error, r));
dbus_error_free(&error);
+ } else if (target->meta.load_state != UNIT_LOADED)
+ log_error("Failed to load default target: %s", strerror(-target->meta.load_error));
+ if (!target || target->meta.load_state != UNIT_LOADED) {
log_info("Trying to load rescue target...");
+
if ((r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &error, &target)) < 0) {
log_error("Failed to load rescue target: %s", bus_error(&error, r));
dbus_error_free(&error);
goto finish;
+ } else if (target->meta.load_state != UNIT_LOADED) {
+ log_error("Failed to load rescue target: %s", strerror(-target->meta.load_error));
+ goto finish;
}
}