main: fall back to rescue target when default target cannot be loaded

[elogind.git] / target.c

diff --git a/target.c b/target.c
index 03f092e35c112fe8afa81245c272632b4df31b50..b8a7442f1c44b39100bf8f0678ab42c2a3c29d7e 100644 (file)
--- a/target.c
+++ b/target.c
@@ -1,6 +1,26 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
+#include <signal.h>
 
 #include "unit.h"
 #include "target.h"
@@ -17,18 +37,6 @@ static const char* const state_string_table[_TARGET_STATE_MAX] = {
         [TARGET_ACTIVE] = "active"
 };
 
-static int target_init(Unit *u) {
-        int r;
-        assert(u);
-
-        /* Make sure this config file actually exists */
-
-        if ((r = unit_load_fragment_and_dropin(u)) <= 0)
-                return r < 0 ? r : -ENOENT;
-
-        return 0;
-}
-
 static void target_dump(Unit *u, FILE *f, const char *prefix) {
         Target *t = TARGET(u);
 
@@ -81,7 +89,7 @@ static UnitActiveState target_active_state(Unit *u) {
 const UnitVTable target_vtable = {
         .suffix = ".target",
 
-        .init = target_init,
+        .init = unit_load_fragment_and_dropin,
 
         .dump = target_dump,