summaryrefslogtreecommitdiff
path: root/src/target.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-15 00:44:13 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-15 00:45:46 +0100
commit2a796654b9a1f84962e5dafbcf171dcc22742c99 (patch)
tree48ede42feb5e59732a77158b11e5eca75d8c9eda /src/target.c
parent2fc9784656900c4dc3715db506096ddc23fdd87c (diff)
getty: move automatic serial getty logic into generator
Diffstat (limited to 'src/target.c')
-rw-r--r--src/target.c67
1 files changed, 0 insertions, 67 deletions
diff --git a/src/target.c b/src/target.c
index b8d4a01b64..54c34daa0d 100644
--- a/src/target.c
+++ b/src/target.c
@@ -83,70 +83,6 @@ static int target_add_default_dependencies(Target *t) {
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 (detect_container(NULL) > 0)
- return 1;
-
- 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;
@@ -161,9 +97,6 @@ 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;