aboutsummaryrefslogtreecommitdiff
path: root/common/main.c
diff options
context:
space:
mode:
authorJustin L Werner <justin.werner@caononical.com>2012-08-09 14:20:30 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-08-09 15:58:35 -0600
commitdc80e007bc12f30e087891873332ddb3c710c6f3 (patch)
tree26dc28b5222acf3db85a4e86c335567d9e635b18 /common/main.c
parent2c872ca6e22ad5e5011fcd76e4293b75b37ffed5 (diff)
PXE: add dhcp option support for better pxe support2012.05.62012.05-6
"MAGIC" - 208 - An option whose presence and content verifies to the PXELINUX bootloader that the options numbered 209-211 are for the purpose as described herein. "ConfigFile" - 209 - Configures the path/filename component of the configuration file's location, which this bootloader should use to configure itself. "PathPrefix" - 210 - Configures a value to be prepended to the ConfigFile to discern the directory location of the file. "RebootTime" - 211 - Configures a timeout after which the bootstrap program will reboot the system (most likely returning it to PXE). Signed-off-by: Justin L Werner <justin.werner@caononical.com> Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index 3b9e39a98..0a39c05d9 100644
--- a/common/main.c
+++ b/common/main.c
@@ -43,6 +43,10 @@
#include <linux/ctype.h>
#include <menu.h>
+#if defined(CONFIG_BOOTP_VENDOREX) && defined(CONFIG_BOOTP_VENDOREX_PXE_SHARED)
+#include "../net/magic.h"
+#endif
+
#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
DECLARE_GLOBAL_DATA_PTR;
#endif
@@ -470,6 +474,13 @@ void init_cmd_timeout(void)
*/
void reset_cmd_timeout(void)
{
+#if defined(CONFIG_BOOTP_VENDOREX) && defined(CONFIG_BOOTP_VENDOREX_PXE_SHARED)
+ char *pxe_reboot_time = getenv(PXE_REBOOT_TIME);
+
+ if (pxe_reboot_time && *pxe_reboot_time) {
+ retry_time = atoi(pxe_reboot_time);
+ }
+#endif
endtime = endtick(retry_time);
}
#endif