# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1468739420 -7200
# Node ID 997d9f1a70ea68d1b900591738bb323718ea3b1b
# Parent  5cc3d87b40f94b1c762e135b0d119257918ecddd
syslinux: adjust custom conf location (again)

diff -r 5cc3d87b40f9 -r 997d9f1a70ea ipxe/receipt
--- a/ipxe/receipt	Fri Jul 15 19:10:20 2016 +0100
+++ b/ipxe/receipt	Sun Jul 17 09:10:20 2016 +0200
@@ -25,7 +25,9 @@
 	    -e 's|//\(#define.*CONSOLE_CMD\)|\1|' \
 	    -e 's|//\(#define.*REBOOT_CMD\)|\1|' config/general.h
 	cp $stuff/lkrnprefix.S arch/i386/prefix
-	make bin/undionly.kpxe bin/ipxe.kpxe bin/ipxe.lkrn EMBED=$stuff/ipxe.cmd
+	make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \
+	     bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \
+	     bin/ipxe.kkkpxe bin/ipxe.nbi bin/ipxe.lkrn EMBED=$stuff/ipxe.cmd
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 5cc3d87b40f9 -r 997d9f1a70ea syslinux/stuff/extra/readconfig.u
--- a/syslinux/stuff/extra/readconfig.u	Fri Jul 15 19:10:20 2016 +0100
+++ b/syslinux/stuff/extra/readconfig.u	Sun Jul 17 09:10:20 2016 +0200
@@ -25,7 +25,7 @@
 +
 +			disk_get_params(sdi->iso.drive_number, &diskinfo);
 +			custom_buffer = disk_read_sectors(&diskinfo, 32768 / diskinfo.bps, 1);
-+			got_config = (16 + *(unsigned long *) (custom_buffer + 80))
++			got_config = (*(unsigned long *) (custom_buffer + 80))
 +				* 2048 / diskinfo.bps;
 +			free(custom_buffer);
 +			custom_buffer = disk_read_sectors(&diskinfo, got_config, 1);