aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-03 16:13:28 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-03 16:13:28 -0800
commit27d83f63e5aac365c22896d4645090c80873f672 (patch)
tree4316ed5d849527c679eec168ffe8c80f1b39f341
parente7a5f95432132c8fc8f8ede39fda1d368002ddd8 (diff)
downloadsyslinux.git-27d83f63e5aac365c22896d4645090c80873f672.tar.gz
syslinux.git-27d83f63e5aac365c22896d4645090c80873f672.tar.xz
syslinux.git-27d83f63e5aac365c22896d4645090c80873f672.zip
gPXE: suppress the Ctrl+B bannersyslinux-3.85-pre5
Suppress the Ctrl+B banner and zero out the timeout. It's not very useful for an integrated product, and very visually annoying on NBP chainload. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--gpxe/gpxe.diff27
-rw-r--r--gpxe/src/config/general.h2
-rw-r--r--gpxe/src/hci/shell_banner.c3
3 files changed, 31 insertions, 1 deletions
diff --git a/gpxe/gpxe.diff b/gpxe/gpxe.diff
index 3df08a21..184a0cd3 100644
--- a/gpxe/gpxe.diff
+++ b/gpxe/gpxe.diff
@@ -13,3 +13,30 @@ index 0a9e625..de51f9f 100644
#undef DOWNLOAD_PROTO_TFTM /* Multicast Trivial File Transfer Protocol */
#undef DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */
+diff --git a/gpxe/src/config/general.h b/gpxe/src/config/general.h
+index de51f9f..2f5a938 100644
+--- a/gpxe/src/config/general.h
++++ b/gpxe/src/config/general.h
+@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
+ * Timer configuration
+ *
+ */
+-#define BANNER_TIMEOUT 20 /* Tenths of a second for which the shell
++#define BANNER_TIMEOUT 0 /* Tenths of a second for which the shell
+ banner should appear */
+
+ /*
+diff --git a/gpxe/src/hci/shell_banner.c b/gpxe/src/hci/shell_banner.c
+index 8afefe3..b92e08e 100644
+--- a/gpxe/src/hci/shell_banner.c
++++ b/gpxe/src/hci/shell_banner.c
+@@ -41,6 +41,9 @@ int shell_banner ( void ) {
+ int wait_count;
+ int key;
+
++ if ( BANNER_TIMEOUT <= 0 )
++ return enter_shell;
++
+ printf ( "\nPress Ctrl-B for the gPXE command line..." );
+
+ /* Wait for key */
diff --git a/gpxe/src/config/general.h b/gpxe/src/config/general.h
index de51f9f8..2f5a9387 100644
--- a/gpxe/src/config/general.h
+++ b/gpxe/src/config/general.h
@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
* Timer configuration
*
*/
-#define BANNER_TIMEOUT 20 /* Tenths of a second for which the shell
+#define BANNER_TIMEOUT 0 /* Tenths of a second for which the shell
banner should appear */
/*
diff --git a/gpxe/src/hci/shell_banner.c b/gpxe/src/hci/shell_banner.c
index 8afefe3d..b92e08e3 100644
--- a/gpxe/src/hci/shell_banner.c
+++ b/gpxe/src/hci/shell_banner.c
@@ -41,6 +41,9 @@ int shell_banner ( void ) {
int wait_count;
int key;
+ if ( BANNER_TIMEOUT <= 0 )
+ return enter_shell;
+
printf ( "\nPress Ctrl-B for the gPXE command line..." );
/* Wait for key */