narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[console] Exclude text-based UI output from logfile-based consoles 

The output from text-based user interfaces such as the "config"
command is not generally meaningful for logfile-based consoles such as
syslog and vmconsole.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/6/head
Michael Brown 2012-03-26 19:02:30 +01:00
parent e024cd39a8
commit 64d17dbd50
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/interface/vmware/vmconsole.c
View File

@ -37,7 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
/* Set default console usage if applicable */ /* Set default console usage if applicable */
#if ! ( defined ( CONSOLE_VMWARE ) && CONSOLE_EXPLICIT ( CONSOLE_VMWARE ) ) #if ! ( defined ( CONSOLE_VMWARE ) && CONSOLE_EXPLICIT ( CONSOLE_VMWARE ) )
#undef CONSOLE_VMWARE #undef CONSOLE_VMWARE
#define CONSOLE_VMWARE CONSOLE_USAGE_ALL #define CONSOLE_VMWARE ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_TUI )
#endif #endif
/** VMware logfile console GuestRPC channel */ /** VMware logfile console GuestRPC channel */

16
src/hci/mucurses/ansi_screen.c
View File

@ -12,6 +12,8 @@ static void ansiscr_putc(struct _curses_screen *scr, chtype c) __nonnull;
unsigned short _COLS = 80; unsigned short _COLS = 80;
unsigned short _LINES = 24; unsigned short _LINES = 24;
static unsigned int saved_usage;
static void ansiscr_reset ( struct _curses_screen *scr ) { static void ansiscr_reset ( struct _curses_screen *scr ) {
/* Reset terminal attributes and clear screen */ /* Reset terminal attributes and clear screen */
scr->attrs = 0; scr->attrs = 0;
@ -20,6 +22,16 @@ static void ansiscr_reset ( struct _curses_screen *scr ) {
printf ( "\033[0m" ); printf ( "\033[0m" );
} }
static void ansiscr_init ( struct _curses_screen *scr ) {
saved_usage = console_set_usage ( CONSOLE_USAGE_TUI );
ansiscr_reset ( scr );
}
static void ansiscr_exit ( struct _curses_screen *scr ) {
ansiscr_reset ( scr );
console_set_usage ( saved_usage );
}
static void ansiscr_movetoyx ( struct _curses_screen *scr, static void ansiscr_movetoyx ( struct _curses_screen *scr,
unsigned int y, unsigned int x ) { unsigned int y, unsigned int x ) {
if ( ( x != scr->curs_x ) || ( y != scr->curs_y ) ) { if ( ( x != scr->curs_x ) || ( y != scr->curs_y ) ) {
@ -65,8 +77,8 @@ static bool ansiscr_peek ( struct _curses_screen *scr __unused ) {
} }
SCREEN _ansi_screen = { SCREEN _ansi_screen = {
.init = ansiscr_reset, .init = ansiscr_init,
.exit = ansiscr_reset, .exit = ansiscr_exit,
.movetoyx = ansiscr_movetoyx, .movetoyx = ansiscr_movetoyx,
.putc = ansiscr_putc, .putc = ansiscr_putc,
.getc = ansiscr_getc, .getc = ansiscr_getc,

6
src/include/ipxe/console.h
View File

@ -117,8 +117,12 @@ struct console_driver {
/** Debug messages */ /** Debug messages */
#define CONSOLE_USAGE_DEBUG 0x0002 #define CONSOLE_USAGE_DEBUG 0x0002
/** Text-based user interface */
#define CONSOLE_USAGE_TUI 0x0004
/** All console usages */ /** All console usages */
#define CONSOLE_USAGE_ALL ( CONSOLE_USAGE_STDOUT | CONSOLE_USAGE_DEBUG ) #define CONSOLE_USAGE_ALL \
( CONSOLE_USAGE_STDOUT | CONSOLE_USAGE_DEBUG | CONSOLE_USAGE_TUI )
/** @} */ /** @} */

2
src/net/udp/syslog.c
View File

@ -39,7 +39,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
/* Set default console usage if applicable */ /* Set default console usage if applicable */
#if ! ( defined ( CONSOLE_SYSLOG ) && CONSOLE_EXPLICIT ( CONSOLE_SYSLOG ) ) #if ! ( defined ( CONSOLE_SYSLOG ) && CONSOLE_EXPLICIT ( CONSOLE_SYSLOG ) )
#undef CONSOLE_SYSLOG #undef CONSOLE_SYSLOG
#define CONSOLE_SYSLOG CONSOLE_USAGE_ALL #define CONSOLE_SYSLOG ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_TUI )
#endif #endif
/** The syslog server */ /** The syslog server */