X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftarget.c;h=27b54e380891c907c91d5d9b5b694c685697e84f;hp=8fcb46d229f18b6ede72d4ad36b3d8a4a5b64544;hb=21bc923aa35d455cdef1607eb7022608c705c9f3;hpb=eaf91020117150567aee61d1324067c307e18950

diff --git a/src/target.c b/src/target.c
index 8fcb46d22..27b54e380 100644
--- 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.
@@ -21,6 +21,7 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
 
 #include "unit.h"
 #include "target.h"
@@ -28,6 +29,7 @@
 #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,
@@ -47,7 +49,7 @@ static void target_set_state(Target *t, TargetState 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]);
+        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], true);
 }
 
 static int target_add_default_dependencies(Target *t) {
@@ -55,23 +57,86 @@ static int target_add_default_dependencies(Target *t) {
         Unit *other;
         int r;
 
+        assert(t);
+
         /* 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;
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 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;
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 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)
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0)
+                    return r;
+
+        /* Make sure targets are unloaded on shutdown */
+        return unit_add_dependency_by_name(UNIT(t), UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+}
+
+static int target_add_getty_dependencies(Target *t) {
+        char *n, *active;
+        int r;
+
+        assert(t);
+
+        if (!unit_has_name(UNIT(t), SPECIAL_GETTY_TARGET))
+                return 0;
+
+        if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
+                const char *tty;
+
+                truncate_nl(active);
+                if ((tty = strrchr(active, ' ')))
+                        tty ++;
+                else
+                        tty = active;
+
+                /* Automatically add in a serial getty on the kernel
+                 * console */
+                if (!tty_is_vc(tty)) {
+
+                        /* We assume that gettys on virtual terminals are
+                         * started via manual configuration and do this magic
+                         * only for non-VC terminals. */
+
+                        log_debug("Automatically adding serial getty for /dev/%s", tty);
+                        if (!(n = unit_name_replace_instance(SPECIAL_SERIAL_GETTY_SERVICE, tty))) {
+                                free(active);
+                                return -ENOMEM;
+                        }
+
+                        r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_WANTS, n, NULL, true);
+                        free(n);
+
+                        if (r < 0) {
+                                free(active);
                                 return r;
+                        }
+                }
+
+                free(active);
+        }
+
+        /* 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;
 }
@@ -90,6 +155,9 @@ static int target_load(Unit *u) {
                 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;
@@ -207,5 +275,6 @@ const UnitVTable target_vtable = {
         .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
 };