wok-6.x rev 15369
syslinux: replace gpxe by ipxe
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Oct 14 15:01:17 2013 +0000 (2013-10-14) |
parents | db33cd473e3e |
children | 2e1b0be4589a |
files | ipxe/stuff/lkrnprefix.S syslinux/receipt syslinux/stuff/iso2exe/init syslinux/stuff/isolinux.cfg |
line diff
1.1 --- a/ipxe/stuff/lkrnprefix.S Mon Oct 14 13:38:36 2013 +0000 1.2 +++ b/ipxe/stuff/lkrnprefix.S Mon Oct 14 15:01:17 2013 +0000 1.3 @@ -21,12 +21,6 @@ 1.4 contains some other parameters that aren't interesting in this 1.5 case. 1.6 1.7 - When a bootloader loads the sectors that comprise a kernel image, 1.8 - it doesn't execute the code in the first sector (since that code 1.9 - would try to load the image from a floppy disk.) The code in the 1.10 - first sector below doesn't expect to get executed (and prints an 1.11 - error message if it ever -is- executed.) 1.12 - 1.13 We don't require much in the way of setup code. Historically, the 1.14 Linux kernel required at least 4 sectors of setup code. 1.15 Therefore, at least 4 sectors must be present even though we don't 1.16 @@ -104,7 +98,6 @@ 1.17 .word 0 // Checksum 1.18 .word _exe_start // Initial IP value 1.19 /* Initial code segment (relative to start of executable) */ 1.20 - //.word -( ( _exe_start - signature ) / 16 ) // Initial (relative) CS value 1.21 .word -( HEADER_SIZE / 16 ) // Initial (relative) CS value 1.22 // .word 0x001C // File address of relocation table 1.23 // .word 0,0,0 // Overlay number
2.1 --- a/syslinux/receipt Mon Oct 14 13:38:36 2013 +0000 2.2 +++ b/syslinux/receipt Mon Oct 14 15:01:17 2013 +0000 2.3 @@ -10,7 +10,7 @@ 2.4 WEB_SITE="http://syslinux.zytor.com/" 2.5 WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/$TARBALL" 2.6 BUILD_DEPENDS="kbd-base perl nasm dev86 lzma mingw32-gcc upx posixovl" 2.7 -DEPENDS="gpxe memtest" 2.8 +DEPENDS="ipxe memtest" 2.9 CONFIG_FILES="/boot/isolinux" 2.10 2.11 # Rules to gen a SliTaz package suitable for Tazpkg.
3.1 --- a/syslinux/stuff/iso2exe/init Mon Oct 14 13:38:36 2013 +0000 3.2 +++ b/syslinux/stuff/iso2exe/init Mon Oct 14 15:01:17 2013 +0000 3.3 @@ -319,7 +319,7 @@ 3.4 from the Web using PXE and HTTP protocols.\n 3.5 " 12 70 3.6 [ $? -eq 0 ] || return 3.7 - cp /media/cdrom/boot/gpxe /mnt 3.8 + cp /media/cdrom/boot/?pxe /mnt 3.9 } 3.10 3.11 fdgpxe() 3.12 @@ -334,7 +334,7 @@ 3.13 Please insert a blank disk in floppy drive.\n 3.14 " 12 70 3.15 [ $? -eq 0 ] || return 3.16 - dd if=/media/cdrom/boot/gpxe of=/dev/fd0 3.17 + dd if=/media/cdrom/boot/?pxe of=/dev/fd0 3.18 } 3.19 3.20 xfile() 3.21 @@ -540,6 +540,8 @@ 3.22 $(cdfile boot/memtest "fdmemtest" "Create a Memtest86 boot floppy") \ 3.23 $(cdfile Xboot/gpxe "gpxe" "Get SliTaz Web boot utility") \ 3.24 $(cdfile boot/gpxe "fdgpxe" "Create a SliTaz Web boot floppy") \ 3.25 +$(cdfile Xboot/ipxe "gpxe" "Get SliTaz Web boot utility") \ 3.26 +$(cdfile boot/ipxe "fdgpxe" "Create a SliTaz Web boot floppy") \ 3.27 $(xfile reboot "restart" "Restart the computer") \ 3.28 $(xfile poweroff "stop" "Power off") \ 3.29 "bootlog" "Linux boot messages" \
4.1 --- a/syslinux/stuff/isolinux.cfg Mon Oct 14 13:38:36 2013 +0000 4.2 +++ b/syslinux/stuff/isolinux.cfg Mon Oct 14 15:01:17 2013 +0000 4.3 @@ -52,7 +52,7 @@ 4.4 4.5 LABEL web zeb 4.6 MENU LABEL Web Boot 4.7 - KERNEL /boot/gpxe 4.8 + KERNEL /boot/ipxe 4.9 4.10 LABEL reboot 4.11 MENU LABEL Reboot System