wok-current rev 19333

syslinux: adjust custom conf location (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jul 17 09:10:20 2016 +0200 (2016-07-17)
parents 5cc3d87b40f9
children 075a1be356a3
files ipxe/receipt syslinux/stuff/extra/readconfig.u
line diff
     1.1 --- a/ipxe/receipt	Fri Jul 15 19:10:20 2016 +0100
     1.2 +++ b/ipxe/receipt	Sun Jul 17 09:10:20 2016 +0200
     1.3 @@ -25,7 +25,9 @@
     1.4  	    -e 's|//\(#define.*CONSOLE_CMD\)|\1|' \
     1.5  	    -e 's|//\(#define.*REBOOT_CMD\)|\1|' config/general.h
     1.6  	cp $stuff/lkrnprefix.S arch/i386/prefix
     1.7 -	make bin/undionly.kpxe bin/ipxe.kpxe bin/ipxe.lkrn EMBED=$stuff/ipxe.cmd
     1.8 +	make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \
     1.9 +	     bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \
    1.10 +	     bin/ipxe.kkkpxe bin/ipxe.nbi bin/ipxe.lkrn EMBED=$stuff/ipxe.cmd
    1.11  }
    1.12  
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/syslinux/stuff/extra/readconfig.u	Fri Jul 15 19:10:20 2016 +0100
     2.2 +++ b/syslinux/stuff/extra/readconfig.u	Sun Jul 17 09:10:20 2016 +0200
     2.3 @@ -25,7 +25,7 @@
     2.4  +
     2.5  +			disk_get_params(sdi->iso.drive_number, &diskinfo);
     2.6  +			custom_buffer = disk_read_sectors(&diskinfo, 32768 / diskinfo.bps, 1);
     2.7 -+			got_config = (16 + *(unsigned long *) (custom_buffer + 80))
     2.8 ++			got_config = (*(unsigned long *) (custom_buffer + 80))
     2.9  +				* 2048 / diskinfo.bps;
    2.10  +			free(custom_buffer);
    2.11  +			custom_buffer = disk_read_sectors(&diskinfo, got_config, 1);