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) {
return r;
/* Make sure targets are unloaded on shutdown */
- return unit_add_dependency_by_name(UNIT(t), UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ 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;
+ char *n, *active;
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;
+ if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
+ const char *tty;
- r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_WANTS, n, NULL, true);
- free(n);
+ truncate_nl(active);
+ if ((tty = strrchr(active, ' ')))
+ tty ++;
+ else
+ tty = active;
- if (r < 0)
- return r;
+ /* 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