Restore VT limit and add note explaining origin

pull/2/head
Timothy Pearson 9 years ago
parent a486f914fc
commit fcb6161cee

@ -51,7 +51,8 @@ from the copyright holder.
# include <sys/vt.h> # include <sys/vt.h>
#endif #endif
#define MAX_VT_NUMBER 32 // Limited by short return data type of VT_ACTIVATE ioctl
#define MAX_VT_NUMBER 16
static void SigHandler( int n ); static void SigHandler( int n );
static int ScanConfigs( int force ); static int ScanConfigs( int force );
@ -326,8 +327,9 @@ activateVT( int vt )
static void static void
WakeDisplay( struct display *d ) WakeDisplay( struct display *d )
{ {
if (d->status == textMode) if (d->status == textMode) {
d->status = (d->displayType & d_lifetime) == dReserve ? reserve : notRunning; d->status = (d->displayType & d_lifetime) == dReserve ? reserve : notRunning;
}
} }
#endif #endif
@ -856,7 +858,6 @@ cancelShutdown( void )
RescanConfigs( TRUE ); RescanConfigs( TRUE );
} }
static void static void
ReapChildren( void ) ReapChildren( void )
{ {
@ -990,13 +991,11 @@ ReapChildren( void )
rStopDisplay(d, d->zstatus); rStopDisplay(d, d->zstatus);
break; break;
case phoenix: case phoenix:
Debug( "phoenix X server arises, restarting display %s\n", Debug( "phoenix X server arises, restarting display %s\n", d->name );
d->name );
d->status = notRunning; d->status = notRunning;
break; break;
case remoteLogin: case remoteLogin:
Debug( "remote login X server for display %s exited\n", Debug( "remote login X server for display %s exited\n", d->name );
d->name );
d->status = ((d->displayType & d_lifetime) == dReserve) ? d->status = ((d->displayType & d_lifetime) == dReserve) ?
reserve : notRunning; reserve : notRunning;
break; break;
@ -1510,8 +1509,7 @@ ExitDisplay(
goodExit = TRUE; goodExit = TRUE;
} }
Debug( "ExitDisplay %s, " Debug( "ExitDisplay %s, endState = %d, serverCmd = %d, GoodExit = %d\n",
"endState = %d, serverCmd = %d, GoodExit = %d\n",
d->name, endState, serverCmd, goodExit ); d->name, endState, serverCmd, goodExit );
d->userSess = -1; d->userSess = -1;

Loading…
Cancel
Save