swap: major rework, use /sbin/swapon for setting up swaps, fix merging of aliased...

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ee12e1f3aff7691bb25782539138ff19acbfac57..fa306d6aad3bf18a1b07162e06d77993edf04fb5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -73,11 +73,6 @@ static char *arg_console = NULL;
 
 static FILE* serialization = NULL;
 
-_noreturn_ static void freeze(void) {
-        for (;;)
-                pause();
-}
-
 static void nop_handler(int sig) {
 }
 
@@ -1065,8 +1060,10 @@ 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)
+                } else if (target->meta.load_state == UNIT_ERROR)
                         log_error("Failed to load default target: %s", strerror(-target->meta.load_error));
+                else if (target->meta.load_state == UNIT_MASKED)
+                        log_error("Default target masked.");
 
                 if (!target || target->meta.load_state != UNIT_LOADED) {
                         log_info("Trying to load rescue target...");
@@ -1075,12 +1072,17 @@ int main(int argc, char *argv[]) {
                                 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) {
+                        } else if (target->meta.load_state == UNIT_ERROR) {
                                 log_error("Failed to load rescue target: %s", strerror(-target->meta.load_error));
                                 goto finish;
+                        } else if (target->meta.load_state == UNIT_MASKED) {
+                                log_error("Rescue target masked.");
+                                goto finish;
                         }
                 }
 
+                assert(target->meta.load_state == UNIT_LOADED);
+
                 if (arg_action == ACTION_TEST) {
                         printf("-> By units:\n");
                         manager_dump_units(m, stdout, "\t");