diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-05-22 23:03:47 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-05-22 23:03:47 -0700 |
| commit | 1e7084a905560314d7a30b7826d77783f4d3740e (patch) | |
| tree | e5997a4406715a5b269b9bbf88ee68f0ead8cd87 | |
| parent | 293eef28a898041183610325a326d00ced801002 (diff) | |
| download | syslinux-3.50-pre14.tar.gz | |
Make the menu system understand INCLUDE as well.syslinux-3.50-pre14
This adds support for INCLUDE (as opposed to MENU INCLUDE) to the
menu system.
| -rw-r--r-- | README.menu | 7 | ||||
| -rw-r--r-- | com32/modules/readconfig.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/README.menu b/README.menu index 18e93c6e..3185e5c9 100644 --- a/README.menu +++ b/README.menu @@ -124,11 +124,14 @@ MENU BACKGROUND filename be 640x480 pixels and either in PNG or JPEG format. +INCLUDE filename MENU INCLUDE filename Include the contents of the configuration file filename at - this point. Keep in mind that the included data is only seen - by the menu system; the core syslinux code does not parse this + this point. + + In the case of MENU INCLUDE, the included data is only seen by + the menu system; the core syslinux code does not parse this command, so any labels defined in it are unavailable. diff --git a/com32/modules/readconfig.c b/com32/modules/readconfig.c index 12ea76cd..44da72f2 100644 --- a/com32/modules/readconfig.c +++ b/com32/modules/readconfig.c @@ -576,6 +576,9 @@ static void parse_config_file(FILE *f) break; } } + } else if ( (ep = looking_at(p, "include")) ) { + p = skipspace(ep); + parse_one_config(p); } else if ( looking_at(p, "append") ) { char *a = strdup(skipspace(p+6)); if ( ld.label ) |