From 89b6ff63fc7e8d4b1d2c23f57312d31dddfb5259 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 9 Dec 2012 14:19:17 +0100 Subject: [PATCH] seat: always activate fake-VTs during startup Instead of relying on --switchvt, we should always activate fake-VTs during startup. Otherwise, we might end up with dead seats as there is no way to wake up kmscon later. Signed-off-by: David Herrmann --- docs/man/kmscon.xml | 6 ------ src/kmscon_seat.c | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/man/kmscon.xml b/docs/man/kmscon.xml index e49cd2c..3db1ab9 100644 --- a/docs/man/kmscon.xml +++ b/docs/man/kmscon.xml @@ -154,12 +154,6 @@ option makes kmscon activate this VT during startup. The same way, during shutdown kmscon will reactivate the VT that was previously active. (default: on) - - Note that this option is required on seats without virtual - terminals, as there is no way to notify kmscon to activate - later. - So disable this option only during debugging or on seats with - virtual terminals. diff --git a/src/kmscon_seat.c b/src/kmscon_seat.c index b2601b8..d8534cb 100644 --- a/src/kmscon_seat.c +++ b/src/kmscon_seat.c @@ -800,7 +800,8 @@ void kmscon_seat_startup(struct kmscon_seat *seat) log_error("cannot register kmscon compositor: %d", ret); } - if (seat->conf->switchvt) + if (seat->conf->switchvt || + uterm_vt_get_type(seat->vt) == UTERM_VT_FAKE) uterm_vt_activate(seat->vt); } -- 2.7.4