From 102adbe199864bff255d417377a1ffea0fe9d5da Mon Sep 17 00:00:00 2001 From: Kazutaka YOKOTA Date: Sun, 28 Nov 1999 07:44:11 +0000 Subject: [PATCH] - Fail VT switching when the controlling program, such as the X server, is not responding to the VT switching protocol. (This part of the code has been somewhat wrong in -CURRENT, but -STABLE has the correct code...) --- sys/dev/syscons/syscons.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0bf5e3721ad2..48ac62f30652 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -2129,14 +2129,14 @@ switch_scr(sc_softc_t *sc, u_int next_scr) case 4: default: /* - * Clear the flag and force the previous switch to finish, - * but return now with error. + * Act as if the controlling program returned + * VT_FALSE. */ DPRINTF(5, ("force reset WAIT_REL, ")); sc->cur_scp->status &= ~SWITCH_WAIT_REL; - s = do_switch_scr(sc, s); + sc->switch_in_progress = 0; splx(s); - DPRINTF(5, ("force finishing previous switch\n")); + DPRINTF(5, ("act as if VT_FALSE was seen\n")); return EINVAL; } } else if (sc->cur_scp->status & SWITCH_WAIT_ACQ) {