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 /dos | |
| 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 'dos')
| -rw-r--r-- | dos/Makefile | 1 | ||||
| -rw-r--r-- | dos/syslinux.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dos/Makefile b/dos/Makefile index 73925711..d4d20c7d 100644 --- a/dos/Makefile +++ b/dos/Makefile @@ -26,6 +26,7 @@ INCLUDES = -include code16.h -nostdinc -iwithprefix include \ -I. -I.. -I../libfat -I ../libinstaller SRCS = syslinux.c \ + ../libinstaller/fat.c \ ../libinstaller/syslxmod.c \ ../libinstaller/bootsect_bin.c \ ../libinstaller/ldlinux_bin.c \ diff --git a/dos/syslinux.c b/dos/syslinux.c index 94517e8f..5dc34836 100644 --- a/dos/syslinux.c +++ b/dos/syslinux.c @@ -755,7 +755,7 @@ int main(int argc, char *argv[]) /* * Patch ldlinux.sys and the boot sector */ - i = syslinux_patch(sectors, nsectors, stupid, raid_mode, subdir); + i = syslinux_patch(sectors, nsectors, stupid, raid_mode, subdir, NULL); patch_sectors = (i + SECTOR_SIZE - 1) >> SECTOR_SHIFT; /* |