diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-02-25 15:25:16 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-02-26 11:29:04 +0000 |
| commit | 76da2ae050d72a31fd47c2fb53f7081781de62ff (patch) | |
| tree | 6da146b5f19ca17ff24d4e74940f14264d38f914 /com32/menu/menumain.c | |
| parent | 41c29c26d70fde563d7c255872bbadad87a39dfa (diff) | |
| parent | 79312306de0150ef64213ef9fbc5aa8580544f03 (diff) | |
| download | syslinux-76da2ae050d72a31fd47c2fb53f7081781de62ff.tar.gz | |
Merge branch 'lwip' into elflink
Welcome to Syslinux 5.10.
Conflicts:
NEWS
com32/lib/Makefile
com32/lib/sys/open.c
com32/lib/syslinux/ipappend.c
com32/modules/Makefile
com32/modules/prdhcp.c
core/Makefile
core/cmdline.inc
core/com32.inc
core/comboot.inc
core/configinit.inc
core/fs/chdir.c
core/fs/fs.c
core/fs/pxe/dnsresolv.c
core/fs/pxe/pxe.c
core/fs/pxe/pxe.h
core/idle.c
core/include/ctype.h
core/init.inc
core/mem/init.c
core/parseconfig.inc
core/runkernel.inc
core/syslinux.ld
core/ui.inc
doc/comboot.txt
version
Diffstat (limited to 'com32/menu/menumain.c')
| -rw-r--r-- | com32/menu/menumain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c index dc99da6e..a3061ede 100644 --- a/com32/menu/menumain.c +++ b/com32/menu/menumain.c @@ -1161,10 +1161,10 @@ int main(int argc, char *argv[]) if (cmdline) { uint32_t type = parse_image_type(cmdline); - execute(cmdline, type); + execute(cmdline, type, false); if (cm->onerror) { type = parse_image_type(cm->onerror); - execute(cm->onerror, type); + execute(cm->onerror, type, true); } } else { return 0; /* Exit */ |