Merge commit 'origin/master' into gpxe-added
authorH. Peter Anvin <hpa@zytor.com>
Wed, 28 May 2008 16:23:57 +0000 (09:23 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 28 May 2008 16:23:57 +0000 (09:23 -0700)
Conflicts:

NEWS
version

1  2 
NEWS
com32/modules/Makefile
comboot.inc
extlinux.asm
isolinux.asm
ldlinux.asm
pxelinux.asm
ui.inc

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,25 -2,14 +2,33 @@@ Starting with 1.47, changes marked wit
  apply to that specific program only; other changes apply to all of
  them.
  
 +Changes in 3.70:
 +      * PXELINUX: Support enhanced capabilities when running on top
 +        of gPXE (http://www.etherboot.org/).  In particular, support
 +        URL-style syntax for filenames, and any protocol that gPXE
 +        supports (except, currently, iSCSI and AoE.)  This feature
 +        is currently highly experimental.
 +      * Substantial infrastructure changes to support files whose
 +        length aren't known at open time (typically network
 +        connections.)  Please note that the semantics of some of the
 +        comboot APIs have changed slightly; please see doc/comboot.doc.
 +      * PXELINUX: We no longer require a TFTP server which supports
 +        the tsize option for all transfers.
 +      * PXELINUX: EXTREMELY EXPERIMENTAL: Support running on top of
 +        the gPXE "PXEXT" PXE API extensions included with gPXE
 +        0.9.4(?) or higher.  This allows booting over other
 +        protocols than TFTP.
 +      * PXELINUX: Integrate with the gPXE source base; unified image
 +        now included as "gpxelinux.0".
 +
+ Changes in 3.64:
+       * SYSLINUX/EXTLINUX: support "localboot" with the same feature
+         set as ISOLINUX.
+       * Add an experimental MBR for GPT partition tables.
+       * Use $(CC) when determining compile flags.
+       * chain.c32: fix booting from logical partitions (Sergey
+         Vlasov.)
  Changes in 3.63:
        * Fix errors in the PCI and DMI detection modules (Erwan Velu,
          Sebastian Herbszt).
Simple merge
diff --cc comboot.inc
Simple merge
diff --cc extlinux.asm
Simple merge
diff --cc isolinux.asm
Simple merge
diff --cc ldlinux.asm
Simple merge
diff --cc pxelinux.asm
Simple merge
diff --cc ui.inc
Simple merge