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=fba99568a3007e53df0665c540106481167f0b98;hb=21bc923aa35d455cdef1607eb7022608c705c9f3;hpb=4cd1fbcc0648a289e9bf9d9047621bbdf7ec0ece diff --git a/src/target.c b/src/target.c index fba99568a..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 #include +#include #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,118 @@ 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) { + Iterator i; + 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 ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0) + return r; + + SET_FOREACH(other, t->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i) + if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0) + return r; + + SET_FOREACH(other, t->meta.dependencies[UNIT_WANTS], i) + 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; +} + +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) { @@ -138,35 +251,6 @@ static const char *target_sub_state_to_string(Unit *u) { 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_RESCUE_TARGET, '1' }, - { SPECIAL_POWEROFF_TARGET, '0' }, - { SPECIAL_REBOOT_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" @@ -177,7 +261,7 @@ DEFINE_STRING_TABLE_LOOKUP(target_state, TargetState); const UnitVTable target_vtable = { .suffix = ".target", - .load = unit_load_fragment_and_dropin, + .load = target_load, .coldplug = target_coldplug, .dump = target_dump, @@ -191,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 };