[shell] Enable "shell" command even when BANNER_TIMEOUT is zero

Setting BANNER_TIMEOUT to zero removes the only symbol reference to
shell.o, causing the "shell" command to become unavailable.

Add SHELL_CMD in config/general.h (enabled by default) which will
explicitly drag in shell.o regardless of the value of BANNER_TIMEOUT.

Reported-by: Julian Brost <julian@0x4a42.net>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/config.c b/src/config/config.c
index 8adb1ed3f194e65c450d5e9244bb24211747459e..2ca05dff7d798435c0f9cb06689b4bc873cc01fd 100644 (file)
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -248,6 +248,9 @@ REQUIRE_OBJECT ( cpuid_cmd );
 #ifdef SYNC_CMD
 REQUIRE_OBJECT ( sync_cmd );
 #endif
+#ifdef SHELL_CMD
+REQUIRE_OBJECT ( shell );
+#endif
 #ifdef NSLOOKUP_CMD
 REQUIRE_OBJECT ( nslookup_cmd );
 #endif

diff --git a/src/config/general.h b/src/config/general.h
index fb1ac93f43e59ab5aeb2a8ba2b4237c893e8029a..e06db52525c43b0313ef37a4013dccf5a75eb1e9 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -134,6 +134,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define MENU_CMD               /* Menu commands */
 #define LOGIN_CMD              /* Login command */
 #define SYNC_CMD               /* Sync command */
+#define SHELL_CMD              /* Shell command */
 //#define NSLOOKUP_CMD         /* DNS resolving command */
 //#define TIME_CMD             /* Time commands */
 //#define DIGEST_CMD           /* Image crypto digest commands */