console: rework automatic getty on kernel console logic again

[elogind.git] / src / target.c

diff --git a/src/target.c b/src/target.c
index 75f8ef8948db484817a53e6a30f1ad71e9645bcb..c350d8fa195bc2844a5b392758bb642e281c06ac 100644 (file)
--- a/src/target.c
+++ b/src/target.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

 
 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.


@@ -21,12 +21,15 @@
 
 #include <errno.h>
 #include <signal.h>
 
 #include <errno.h>
 #include <signal.h>

+#include <unistd.h>

 
 #include "unit.h"
 #include "target.h"
 #include "load-fragment.h"
 #include "log.h"
 #include "dbus-target.h"
 
 #include "unit.h"
 #include "target.h"
 #include "load-fragment.h"
 #include "log.h"
 #include "dbus-target.h"

+#include "special.h"
+#include "unit-name.h"

 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = UNIT_INACTIVE,
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = UNIT_INACTIVE,


@@ -42,13 +45,101 @@ static void target_set_state(Target *t, TargetState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",

-                          UNIT(t)->meta.id,
+                          t->meta.id,

                           target_state_to_string(old_state),
                           target_state_to_string(state));
 
         unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
 }
 
                           target_state_to_string(old_state),
                           target_state_to_string(state));
 
         unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
 }
 

+static int target_add_default_dependencies(Target *t) {
+        Iterator i;
+        Unit *other;
+        int r;
+
+        /* Imply ordering for requirement dependencies on target
+         * units. Note that when the user created a contradicting
+         * ordering manually we won't add anything in here to make
+         * sure we don't create a loop. */
+
+        SET_FOREACH(other, t->meta.dependencies[UNIT_REQUIRES], i)
+                if (!set_get(t->meta.dependencies[UNIT_BEFORE], other))
+                        if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0)
+                                return r;
+        SET_FOREACH(other, t->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+                if (!set_get(t->meta.dependencies[UNIT_BEFORE], other))
+                        if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0)
+                                return r;
+        SET_FOREACH(other, t->meta.dependencies[UNIT_WANTS], i)
+                if (!set_get(t->meta.dependencies[UNIT_BEFORE], other))
+                        if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0)
+                                return r;
+
+        return 0;
+}
+
+static int target_add_getty_dependencies(Target *t) {
+        char *n;
+        int r;
+
+        assert(t);
+
+        if (!unit_has_name(UNIT(t), SPECIAL_GETTY_TARGET))
+                return 0;
+
+        /* Automatically add in a serial getty on the kernel
+         * console */
+        if (t->meta.manager->console) {
+                log_debug("Automatically adding serial getty for %s", t->meta.manager->console);
+                if (!(n = unit_name_replace_instance(SPECIAL_SERIAL_GETTY_SERVICE, t->meta.manager->console)))
+                        return -ENOMEM;
+
+                r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_WANTS, n, NULL, true);
+                free(n);
+
+                if (r < 0)
+                        return r;
+        }
+
+        /* Automatically add in a serial getty on the first
+         * virtualizer console */
+        if (access("/sys/class/tty/hvc0", F_OK) == 0) {
+                log_debug("Automatic adding serial getty for hvc0");
+                if (!(n = unit_name_replace_instance(SPECIAL_SERIAL_GETTY_SERVICE, "hvc0")))
+                        return -ENOMEM;
+
+                r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_WANTS, n, NULL, true);
+                free(n);
+
+                if (r < 0)
+                        return r;
+        }
+
+        return 0;
+}
+
+static int target_load(Unit *u) {
+        Target *t = TARGET(u);
+        int r;
+
+        assert(t);
+
+        if ((r = unit_load_fragment_and_dropin(u)) < 0)
+                return r;
+
+        /* This is a new unit? Then let's add in some extras */
+        if (u->meta.load_state == UNIT_LOADED) {
+                if (u->meta.default_dependencies)
+                        if ((r = target_add_default_dependencies(t)) < 0)
+                                return r;
+
+                if ((r = target_add_getty_dependencies(t)) < 0)
+                        return r;
+        }
+
+        return 0;
+}
+

 static int target_coldplug(Unit *u) {
         Target *t = TARGET(u);
 
 static int target_coldplug(Unit *u) {
         Target *t = TARGET(u);
 


@@ -137,35 +228,6 @@ static const char *target_sub_state_to_string(Unit *u) {
         return target_state_to_string(TARGET(u)->state);
 }
 
         return target_state_to_string(TARGET(u)->state);
 }
 

-int target_get_runlevel(Target *t) {
-
-        static const struct {
-                const char *special;
-                const int runlevel;
-        } table[] = {
-                { SPECIAL_RUNLEVEL5_TARGET, '5' },
-                { SPECIAL_RUNLEVEL4_TARGET, '4' },
-                { SPECIAL_RUNLEVEL3_TARGET, '3' },
-                { SPECIAL_RUNLEVEL2_TARGET, '2' },
-                { SPECIAL_RUNLEVEL1_TARGET, '1' },
-                { SPECIAL_RUNLEVEL0_TARGET, '0' },
-                { SPECIAL_RUNLEVEL6_TARGET, '6' },
-        };
-
-        unsigned i;
-
-        assert(t);
-
-        /* Tries to determine if this is a SysV runlevel and returns
-         * it if that is so. */
-
-        for (i = 0; i < ELEMENTSOF(table); i++)
-                if (unit_has_name(UNIT(t), table[i].special))
-                        return table[i].runlevel;
-
-        return 0;
-}
-

 static const char* const target_state_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = "dead",
         [TARGET_ACTIVE] = "active"
 static const char* const target_state_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = "dead",
         [TARGET_ACTIVE] = "active"


@@ -176,7 +238,7 @@ DEFINE_STRING_TABLE_LOOKUP(target_state, TargetState);
 const UnitVTable target_vtable = {
         .suffix = ".target",
 
 const UnitVTable target_vtable = {
         .suffix = ".target",
 

-        .load = unit_load_fragment_and_dropin,
+        .load = target_load,

         .coldplug = target_coldplug,
 
         .dump = target_dump,
         .coldplug = target_coldplug,
 
         .dump = target_dump,


@@ -190,5 +252,6 @@ const UnitVTable target_vtable = {
         .active_state = target_active_state,
         .sub_state_to_string = target_sub_state_to_string,
 
         .active_state = target_active_state,
         .sub_state_to_string = target_sub_state_to_string,
 

+        .bus_interface = "org.freedesktop.systemd1.Target",

         .bus_message_handler = bus_target_message_handler
 };
         .bus_message_handler = bus_target_message_handler
 };