diff options
| -rw-r--r-- | src/core/main.c | 23 | ||||
| -rw-r--r-- | src/include/ipxe/dhcp.h | 9 |
2 files changed, 27 insertions, 5 deletions
diff --git a/src/core/main.c b/src/core/main.c index aac27e9ba..9fd4a76ff 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -15,6 +15,7 @@ Literature dealing with the network protocols: FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> +#include <stdlib.h> #include <ipxe/init.h> #include <ipxe/features.h> #include <ipxe/shell.h> @@ -28,6 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define BOLD "\033[1m" #define CYAN "\033[36m" +/** The "scriptlet" setting */ +struct setting scriptlet_setting __setting ( SETTING_MISC ) = { + .name = "scriptlet", + .description = "Boot scriptlet", + .tag = DHCP_EB_SCRIPTLET, + .type = &setting_type_string, +}; + /** * Prompt for shell entry * @@ -51,6 +60,7 @@ static int shell_banner ( void ) { __asmcall int main ( void ) { struct feature *feature; struct image *image; + char *scriptlet; /* Some devices take an unreasonably long time to initialise */ printf ( PRODUCT_SHORT_NAME " initialising devices..." ); @@ -82,11 +92,16 @@ __asmcall int main ( void ) { if ( ( image = first_image() ) != NULL ) { /* We have an embedded image; execute it */ image_exec ( image ); + } else if ( shell_banner() ) { + /* User wants shell; just give them a shell */ + shell(); } else { - /* Prompt for shell */ - if ( shell_banner() ) { - /* User wants shell; just give them a shell */ - shell(); + fetch_string_setting_copy ( NULL, &scriptlet_setting, + &scriptlet ); + if ( scriptlet ) { + /* User has defined a scriptlet; execute it */ + system ( scriptlet ); + free ( scriptlet ); } else { /* Try booting. If booting fails, offer the * user another chance to enter the shell. diff --git a/src/include/ipxe/dhcp.h b/src/include/ipxe/dhcp.h index 54a85f661..148e3d66f 100644 --- a/src/include/ipxe/dhcp.h +++ b/src/include/ipxe/dhcp.h @@ -307,10 +307,17 @@ struct dhcp_client_uuid { #define DHCP_EB_SKIP_SAN_BOOT DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0x09 ) /* - * Tags in the range 0x10-0x7f are reserved for feature markers + * Tags in the range 0x10-0x4f are reserved for feature markers * */ +/** Scriptlet + * + * If a scriptlet exists, it will be executed in place of the usual + * call to autoboot() + */ +#define DHCP_EB_SCRIPTLET DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0x51 ) + /** Skip PXE DHCP protocol extensions such as ProxyDHCP * * If set to a non-zero value, iPXE will not wait for ProxyDHCP offers |