Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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>
  • Loading branch information
mcb30 committed Mar 26, 2012
1 parent e024cd3 commit 64d17db
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/arch/i386/interface/vmware/vmconsole.c
Expand Up @@ -37,7 +37,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
/* Set default console usage if applicable */
#if ! ( defined ( CONSOLE_VMWARE ) && CONSOLE_EXPLICIT ( CONSOLE_VMWARE ) )
#undef CONSOLE_VMWARE
#define CONSOLE_VMWARE CONSOLE_USAGE_ALL
#define CONSOLE_VMWARE ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_TUI )
#endif

/** VMware logfile console GuestRPC channel */
Expand Down
16 changes: 14 additions & 2 deletions src/hci/mucurses/ansi_screen.c
Expand Up @@ -12,6 +12,8 @@ static void ansiscr_putc(struct _curses_screen *scr, chtype c) __nonnull;
unsigned short _COLS = 80;
unsigned short _LINES = 24;

static unsigned int saved_usage;

static void ansiscr_reset ( struct _curses_screen *scr ) {
/* Reset terminal attributes and clear screen */
scr->attrs = 0;
Expand All @@ -20,6 +22,16 @@ static void ansiscr_reset ( struct _curses_screen *scr ) {
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,
unsigned int y, unsigned int x ) {
if ( ( x != scr->curs_x ) || ( y != scr->curs_y ) ) {
Expand Down Expand Up @@ -65,8 +77,8 @@ static bool ansiscr_peek ( struct _curses_screen *scr __unused ) {
}

SCREEN _ansi_screen = {
.init = ansiscr_reset,
.exit = ansiscr_reset,
.init = ansiscr_init,
.exit = ansiscr_exit,
.movetoyx = ansiscr_movetoyx,
.putc = ansiscr_putc,
.getc = ansiscr_getc,
Expand Down
6 changes: 5 additions & 1 deletion src/include/ipxe/console.h
Expand Up @@ -117,8 +117,12 @@ struct console_driver {
/** Debug messages */
#define CONSOLE_USAGE_DEBUG 0x0002

/** Text-based user interface */
#define CONSOLE_USAGE_TUI 0x0004

/** 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 )

/** @} */

Expand Down
2 changes: 1 addition & 1 deletion src/net/udp/syslog.c
Expand Up @@ -39,7 +39,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
/* Set default console usage if applicable */
#if ! ( defined ( CONSOLE_SYSLOG ) && CONSOLE_EXPLICIT ( CONSOLE_SYSLOG ) )
#undef CONSOLE_SYSLOG
#define CONSOLE_SYSLOG CONSOLE_USAGE_ALL
#define CONSOLE_SYSLOG ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_TUI )
#endif

/** The syslog server */
Expand Down

0 comments on commit 64d17db

Please sign in to comment.