search for: menu_ptr

...00644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -165,7 +165,7 @@ void gfx_done(void); int gfx_input(void); ssize_t save_read(int fd, void *buf, size_t size); void *load_one(char *file, ssize_t *file_size); -void boot(void); +void boot(int index); void boot_entry(menu_t *menu_ptr, char *arg); @@ -234,7 +234,7 @@ int main(int argc, char **argv) } // does not return if it succeeds - boot(); + boot(menu_index); } if(argc > 2) show_message(argv[2]); @@ -321,19 +321,19 @@ int read_config_file(void) if(*t) *t++ = 0; t = skip_spaces(t);...

...files changed, 43 insertions(+), 22 deletions(-) diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c index dd4d641..3b09e74 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -134,6 +134,7 @@ gfx_menu_t gfx_menu; menu_t *menu; menu_t *menu_default; +static menu_t *menu_ptr, **menu_next; struct { uint32_t jmp_table[12]; @@ -161,7 +162,7 @@ char *get_config_file_name(void); char *skip_spaces(char *s); char *skip_nonspaces(char *s); void chop_line(char *s); -int read_config_file(void); +int read_config_file(const char *filename); unsigned magic_ok(unsigned cha...

menu_ptr->menu_label is human-readable (perhaps even translatable!) text if the MENU LABEL command is used, which isn't very convenient at the start of a boot entry. Allow the entry to start with menu_ptr->label (an identifier) as an alternative. Signed-off-by: Colin Watson <cjwatson at ubunt...

...line (instead of as part of 'append') char *append; // kernel args char *ipappend; // append special pxelinux args (see doc) @@ -374,6 +375,11 @@ int read_config_file(const char *filenam continue; } + if(!strcasecmp(s, "com32") && menu_ptr) { + menu_ptr->com32 = strdup(t); + continue; + } + if(!strcasecmp(s, "initrd") && menu_ptr) { menu_ptr->initrd = strdup(t); continue; @@ -866,7 +872,13 @@ void boot_entry(menu_t *menu_ptr, char * if(menu_ptr->localboot) { gfx_done(...

Ok, here is the first try to turn the gfxboot wrapper into a com32 module. I had to extend the interface to the gfxboot core a bit to get it working. So it works only with latest gfxboot from git://gitorious.org/gfxboot/gfxboot.git Steffen -------------- next part -------------- A non-text attachment was scrubbed... Name: gfxboot_c32.diff.gz Type: application/x-gzip Size: 7220 bytes Desc: URL:

...ian diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c index 35d180a..58fdc1b 100644 --- a/com32/gfxboot/gfxboot.c +++ b/com32/gfxboot/gfxboot.c @@ -381,6 +381,10 @@ int read_config_file(const char *filename) continue; } + if(!strcasecmp(s, "com32") && menu_ptr) { + continue; + } + if(!strcasecmp(s, "initrd") && menu_ptr) { menu_ptr->initrd = strdup(t); continue;