diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-06-20 17:01:15 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-06-20 17:07:52 -0700 |
| commit | 2ef260d392537d22c927735e6b9e78b02d36bb7b (patch) | |
| tree | 2613b5e58834702827a0523df98b2fc24683f9b2 /linux | |
| parent | 8cf2a1fb42a61f6d19afee86f52ff260fabd1cfa (diff) | |
| download | syslinux-2ef260d392537d22c927735e6b9e78b02d36bb7b.tar.gz | |
Merge syslinux/extlinux patch code and core code
Merge the SYSLINUX and EXTLINUX patching code and core code, removing
EXTLINUX as a separate derivative. All the disk-based systems now use
the same code.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile | 5 | ||||
| -rw-r--r-- | linux/syslinux.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linux/Makefile b/linux/Makefile index 9bf56d12..c3877f23 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -17,15 +17,16 @@ topdir = .. include $(topdir)/MCONFIG -OPTFLAGS = -g -Os +OPTFLAGS = -g -O0 -Dalloca=malloc INCLUDES = -I. -I.. -I../libinstaller CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -LDFLAGS = -s +LDFLAGS = SRCS = syslinux.c \ ../libinstaller/syslxopt.c \ ../libinstaller/syslxcom.c \ ../libinstaller/setadv.c \ + ../libinstaller/fat.c \ ../libinstaller/syslxmod.c \ ../libinstaller/bootsect_bin.c \ ../libinstaller/ldlinux_bin.c diff --git a/linux/syslinux.c b/linux/syslinux.c index 20de62ae..7152d2bc 100644 --- a/linux/syslinux.c +++ b/linux/syslinux.c @@ -474,7 +474,7 @@ umount: * Patch ldlinux.sys and the boot sector */ i = syslinux_patch(sectors, ldlinux_sectors, opt.stupid_mode, - opt.raid_mode, subdir); + opt.raid_mode, subdir, NULL); patch_sectors = (i + SECTOR_SIZE - 1) >> SECTOR_SHIFT; /* |