# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1381762877 0
# Node ID 4ae7c7dde4e2898d3a12603ec5d235076cd56e2f
# Parent  db33cd473e3e6cbd6195c1c8adc7d6f85dfe691a
syslinux: replace gpxe by ipxe

diff -r db33cd473e3e -r 4ae7c7dde4e2 ipxe/stuff/lkrnprefix.S
--- a/ipxe/stuff/lkrnprefix.S	Mon Oct 14 13:38:36 2013 +0000
+++ b/ipxe/stuff/lkrnprefix.S	Mon Oct 14 15:01:17 2013 +0000
@@ -21,12 +21,6 @@
 	contains some other parameters that aren't interesting in this
 	case.
 
-	When a bootloader loads the sectors that comprise a kernel image,
-	it doesn't execute the code in the first sector (since that code
-	would try to load the image from a floppy disk.)  The code in the
-	first sector below doesn't expect to get executed (and prints an
-	error message if it ever -is- executed.)
-
 	We don't require much in the way of setup code.  Historically, the
 	Linux kernel required at least 4 sectors of setup code.
 	Therefore, at least 4 sectors must be present even though we don't
@@ -104,7 +98,6 @@
 	.word	0			// Checksum
 	.word	_exe_start		// Initial IP value
 	/* Initial code segment (relative to start of executable) */
-	//.word	-( ( _exe_start - signature ) / 16 )	// Initial (relative) CS value
 	.word	-( HEADER_SIZE / 16 )	// Initial (relative) CS value
 //	.word	0x001C			// File address of relocation table
 //	.word	0,0,0			// Overlay number
diff -r db33cd473e3e -r 4ae7c7dde4e2 syslinux/receipt
--- a/syslinux/receipt	Mon Oct 14 13:38:36 2013 +0000
+++ b/syslinux/receipt	Mon Oct 14 15:01:17 2013 +0000
@@ -10,7 +10,7 @@
 WEB_SITE="http://syslinux.zytor.com/"
 WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/$TARBALL"
 BUILD_DEPENDS="kbd-base perl nasm dev86 lzma mingw32-gcc upx posixovl"
-DEPENDS="gpxe memtest"
+DEPENDS="ipxe memtest"
 CONFIG_FILES="/boot/isolinux"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r db33cd473e3e -r 4ae7c7dde4e2 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Mon Oct 14 13:38:36 2013 +0000
+++ b/syslinux/stuff/iso2exe/init	Mon Oct 14 15:01:17 2013 +0000
@@ -319,7 +319,7 @@
 from the Web using PXE and HTTP protocols.\n
 " 12 70
 	[ $? -eq 0 ] || return
-	cp /media/cdrom/boot/gpxe /mnt
+	cp /media/cdrom/boot/?pxe /mnt
 }
 
 fdgpxe()
@@ -334,7 +334,7 @@
 Please insert a blank disk in floppy drive.\n
 " 12 70
 	[ $? -eq 0 ] || return
-	dd if=/media/cdrom/boot/gpxe of=/dev/fd0
+	dd if=/media/cdrom/boot/?pxe of=/dev/fd0
 }
 
 xfile()
@@ -540,6 +540,8 @@
 $(cdfile boot/memtest	"fdmemtest"	"Create a Memtest86 boot floppy") \
 $(cdfile Xboot/gpxe	"gpxe"		"Get SliTaz Web boot utility") \
 $(cdfile boot/gpxe	"fdgpxe"	"Create a SliTaz Web boot floppy") \
+$(cdfile Xboot/ipxe	"gpxe"		"Get SliTaz Web boot utility") \
+$(cdfile boot/ipxe	"fdgpxe"	"Create a SliTaz Web boot floppy") \
 $(xfile reboot		"restart"	"Restart the computer") \
 $(xfile poweroff	"stop"		"Power off") \
 			"bootlog"	"Linux boot messages" \
diff -r db33cd473e3e -r 4ae7c7dde4e2 syslinux/stuff/isolinux.cfg
--- a/syslinux/stuff/isolinux.cfg	Mon Oct 14 13:38:36 2013 +0000
+++ b/syslinux/stuff/isolinux.cfg	Mon Oct 14 15:01:17 2013 +0000
@@ -52,7 +52,7 @@
 	
 LABEL web zeb
 	MENU LABEL Web Boot
-	KERNEL /boot/gpxe
+	KERNEL /boot/ipxe
 
 LABEL reboot
 	MENU LABEL Reboot System