From e4fc443f9b70f188963ff33e0a16ccb72a553540 Mon Sep 17 00:00:00 2001 From: Alek Du Date: Wed, 19 May 2010 09:39:57 +0800 Subject: unify common parts of extlinux and syslinux installer Thus we can share same command line options and reduce a lot of dup code... Seems like a big patch, but the changes are quite safe, no much logical change. Signed-off-by: Alek Du Signed-off-by: H. Peter Anvin --- libinstaller/syslxmod.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libinstaller/syslxmod.c') diff --git a/libinstaller/syslxmod.c b/libinstaller/syslxmod.c index be06b9a2..9ab139c6 100644 --- a/libinstaller/syslxmod.c +++ b/libinstaller/syslxmod.c @@ -261,7 +261,7 @@ int syslinux_patch(const uint32_t * sectors, int nsectors, /* Set up the totals */ dw = syslinux_ldlinux_len >> 2; /* COMPLETE dwords, excluding ADV */ set_16_sl(&patcharea->data_sectors, nsect); /* Not including ADVs */ - set_16_sl(&patcharea->adv_sectors, 0); /* ADVs not supported yet */ + set_16_sl(&patcharea->adv_sectors, 2); /* ADVs need 2 sectors */ set_32_sl(&patcharea->dwords, dw); /* Set the sector pointers */ @@ -269,6 +269,7 @@ int syslinux_patch(const uint32_t * sectors, int nsectors, get_16_sl(&patcharea->secptroffset)); nptrs = get_16_sl(&patcharea->secptrcnt); + nsect += 2; while (--nsect) { /* the first sector is in bs->NextSector */ set_32_sl(wp++, *sectors++); nptrs--; -- cgit