aboutsummaryrefslogtreecommitdiffstats
path: root/com32/modules/menu.c
diff options
context:
space:
mode:
authorArne Georg Gleditsch <argggh@linpro.no>2006-09-04 08:50:44 +0200
committerH. Peter Anvin <hpa@zytor.com>2006-09-05 13:50:07 -0700
commit329e23c16d0f3ecd4062ec715fbe047bf85f8976 (patch)
treed7dd01dfadeac1a2751a1326f46d449970859d79 /com32/modules/menu.c
parentdd84dc52d32dacbda4b183d5e36f4c90bfe186b9 (diff)
downloadsyslinux-329e23c16d0f3ecd4062ec715fbe047bf85f8976.tar.gz
syslinux-329e23c16d0f3ecd4062ec715fbe047bf85f8976.tar.xz
syslinux-329e23c16d0f3ecd4062ec715fbe047bf85f8976.zip
Simple menu system updates
Hi, I'm attaching a patch to Syslinux dealing with a handful of issues that were preventing me from using the simple menu interface. Issues covered: * Enable "MENU ONERROR" as a keyword on par with "ONERROR". * Enable hidden menu entries to be used as ontimeout and onerror entries (probably the least estheticalla pleasing part, sorry about that.) * Make global "IPAPPEND" directives apply also when using menu.c32. * Memory allocation fix for the ontimeout-variable (unlabel does free()). * Make menu.c32 add ipappend options at end of kernel commend line, as pxelinux generally does. I see 3.30-pre1 is out now, I haven't had time to check applicability of these patches towards this. Hope they can still be of use. -- Arne. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/modules/menu.c')
-rw-r--r--com32/modules/menu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/com32/modules/menu.c b/com32/modules/menu.c
index d9db5633..f7d44c52 100644
--- a/com32/modules/menu.c
+++ b/com32/modules/menu.c
@@ -838,8 +838,11 @@ int main(int argc, char *argv[])
cmdline = run_menu();
printf("\033[?25h\033[%d;1H\033[0m", END_ROW);
- if ( cmdline )
+ if ( cmdline ) {
execute(cmdline);
+ if ( onerror )
+ execute(onerror);
+ }
else
return 0; /* Exit */
}