From: Christian Hofstaedtler <ch@grml.org>
Date: Fri, 29 Jul 2011 16:35:47 +0000 (+0200)
Subject: Use ipxe.lkrn from ipxe package
X-Git-Tag: v0.16.1~37
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=3e2cebaf9decc2c097fbcc4e5e17350913a60fcf

Use ipxe.lkrn from ipxe package
---

diff --git a/debian/control b/debian/control
index 419e608..8f2ce6a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-live
 Architecture: all
-Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), mkisofs | genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1~grml00), grub-pc-bin
+Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), mkisofs | genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1~grml00), grub-pc-bin, ipxe
 Recommends: grml-live-addons, grml-live-db, ia32-libs
 Suggests: fai-doc
 Description: build system for creating a Grml (based) Linux live system
diff --git a/debian/copyright b/debian/copyright
index 143a884..e164c98 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,16 +40,6 @@ 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 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/grml-live b/grml-live
index 2369cac..44fcea6 100755
--- a/grml-live
+++ b/grml-live
@@ -713,6 +713,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             log   "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)"
             ewarn "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ; eend 0
           else
+            # copy addons from Depended packages
+            cp -a /usr/lib/ipxe/ipxe.lkrn "${TEMPLATE_DIRECTORY}/boot/addons/"
+
             # copy only files so we can handle bsd4grml on its own
             for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
               test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
diff --git a/templates/boot/addons/ipxe.lkrn b/templates/boot/addons/ipxe.lkrn
deleted file mode 100644
index b6a38d4..0000000
Binary files a/templates/boot/addons/ipxe.lkrn and /dev/null differ