From: Michael Prokop <mika@grml.org>
Date: Wed, 20 Apr 2011 09:03:52 +0000 (+0200)
Subject: Addon: Replace gPXE with iPXE (see Debian BTS #474034).
X-Git-Tag: v0.13.3~52
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=55dde69ba032841fce15eb2cef598c05666e9488

Addon: Replace gPXE with iPXE (see Debian BTS #474034).
---

diff --git a/debian/copyright b/debian/copyright
index 25c65a7..28504c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,12 +52,15 @@ License information for the bsd4grml files shipped as
    See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
    for details.
 
-License information for the file gpxe.lkrn shipped as
-/usr/share/grml-live/templates/boot/addons/gpxe.lkrn:
-
-   Downloaded from <http://rom-o-matic.net/gpxe/gpxe-1.0.1/contrib/rom-o-matic/>
-   Etherboot is Open Source under the GNU General Public License Version 2 (GPL2).
-   Visit http://etherboot.org/wiki/usermanual?s[]=gpl#license for details.
+License information for the file ipxe.lkrn shipped as
+/usr/share/grml-live/templates/boot/addons/ipxe.lkrn:
+
+   Extracted from the Debian package ipxe version 1.0.0+git-1.293e34-2
+   The majority of iPXE is licensed under the GNU GPL version 2 (or, at your option,
+   any later version). For historical reasons, some portions of the code are licensed
+   under GPL-compatible licences such as the two-clause BSD licence.
+   Visit http://git.debian.org/?p=users/waldi/ipxe.git;a=blob;f=debian/copyright;hb=HEAD
+   and http://ipxe.org/licensing for details.
 
 License information for the file hdt.c32 shipped as
 /usr/share/grml-live/templates/boot/addons/hdt.c32
diff --git a/templates/boot/addons/gpxe.lkrn b/templates/boot/addons/gpxe.lkrn
deleted file mode 100644
index 62fd847..0000000
Binary files a/templates/boot/addons/gpxe.lkrn and /dev/null differ
diff --git a/templates/boot/addons/ipxe.lkrn b/templates/boot/addons/ipxe.lkrn
new file mode 100644
index 0000000..b6a38d4
Binary files /dev/null and b/templates/boot/addons/ipxe.lkrn differ
diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 05d7493..1dec2de 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -34,8 +34,8 @@ menuentry "Memory test (memtest86+)" {
     linux16 /boot/addons/memtest
 }
 
-menuentry "GPXE - boot via network/PXE" {
-    linux16 /boot/addons/gpxe.lkrn
+menuentry "iPXE - boot via network/PXE" {
+    linux16 /boot/addons/ipxe.lkrn
 }
 
 menuentry "GRUB - all in one image" {
diff --git a/templates/boot/isolinux/addon_25_gxpe.cfg b/templates/boot/isolinux/addon_25_gxpe.cfg
index 80b8250..15f8f20 100644
--- a/templates/boot/isolinux/addon_25_gxpe.cfg
+++ b/templates/boot/isolinux/addon_25_gxpe.cfg
@@ -1,9 +1,9 @@
-label gpxe
-  menu label Run GP^XE
-  kernel /boot/addons/gpxe.lkrn
+label ipxe
+  menu label Run iP^XE
+  kernel /boot/addons/ipxe.lkrn
 
   text help
-                                        Start Etherboot/gPXE for booting via
+                                        Start Etherboot/iPXE for booting via
                                         network (PXE).
   endtext