diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 10:50:27 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 10:50:27 +0000 |
| commit | 4c7278413ef068bd8239fd8a6c69d64bd2c0a385 (patch) | |
| tree | 4c39e8872de7babc24bed9fe528df28c8d82d427 /extlinux | |
| parent | 749297b070d1fe3d82fd9e5c4306b4aaf257f2a1 (diff) | |
| parent | 348ae6af01350a9a46f3076a2facd27918f0f603 (diff) | |
| download | syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.tar.gz syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.tar.xz syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.zip | |
Merge tag 'syslinux-5.00-pre10' into for-hpa/elflink/firmware
Pull in the latest prerelease that includes some bug fixes for ldlinux
and a realloc() bug in core/.
Conflicts:
com32/cmenu/Makefile
com32/elflink/ldlinux/Makefile
com32/lib/Makefile
core/pxelinux.asm
Diffstat (limited to 'extlinux')
| -rw-r--r-- | extlinux/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/extlinux/main.c b/extlinux/main.c index 27527335..d1909745 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -1288,9 +1288,7 @@ int modify_existing_adv(const char *path) if (devfd < 0) return 1; - if (opt.reset_adv) - syslinux_reset_adv(syslinux_adv); - else if (ext_read_adv(path, devfd, &filename) < 0) { + if (ext_read_adv(path, devfd, &filename) < 0) { close(devfd); return 1; } |