From: Christian Hofstaedtler <ch@grml.org>
Date: Fri, 29 Jul 2011 16:49:03 +0000 (+0200)
Subject: Use memdisk and hdt from syslinux-common package
X-Git-Tag: v0.16.1~33
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=773464378cb9b67c0fb7fc770efa2c816efd3b27

Use memdisk and hdt from syslinux-common package
---

diff --git a/debian/control b/debian/control
index 31c3845..3951d7c 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), genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1~grml00), grub-pc-bin, ipxe, pciutils, memtest86+
+Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1~grml00), grub-pc-bin, ipxe, pciutils, memtest86+, syslinux-common
 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 f19d78f..561e36f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,22 +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 hdt.c32 shipped as
-/usr/share/grml-live/templates/boot/addons/hdt.c32
-
-   Downloaded from <http://syslinux.zytor.com/wiki/index.php/Hdt_(Hardware_Detection_Tool)>
-   Copyright 2009 Erwan Velu <erwan(dot)velu(point)free(fr)>
-   Licensed under the MIT license, see directory com32/hdt
-   of the syslinux source package.
-
-License information for the memtest file shipped as
-/usr/share/grml-live/templates/boot/addons/memtest
-
-   Downloaded from <http://www.memtest.org/>
-   Upstream Author: Samuel Demeulemeester <memtest@memtest.org>, based on
-   memtest86 by Chris Brady <cbrady@sgi.com>, and various contributors.
-   Licensed unter the GPL v2.
-
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
diff --git a/grml-live b/grml-live
index 1f255d6..6a96ce4 100755
--- a/grml-live
+++ b/grml-live
@@ -717,6 +717,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             cp -a /usr/lib/ipxe/ipxe.lkrn "${TEMPLATE_DIRECTORY}/boot/addons/"
             cp -a /usr/share/misc/pci.ids "${TEMPLATE_DIRECTORY}/boot/addons/"
             cp -a /boot/memtest86+.bin "${TEMPLATE_DIRECTORY}/boot/addons/memtest"
+            for file in memdisk chain.c32 hdt.c32 menu.c32; do
+              cp -a "/usr/lib/syslinux/${file}" "${TEMPLATE_DIRECTORY}/boot/addons/"
+            done
 
             # copy only files so we can handle bsd4grml on its own
             for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
diff --git a/templates/boot/addons/chain.c32 b/templates/boot/addons/chain.c32
deleted file mode 100644
index 8674e1c..0000000
Binary files a/templates/boot/addons/chain.c32 and /dev/null differ
diff --git a/templates/boot/addons/hdt.c32 b/templates/boot/addons/hdt.c32
deleted file mode 100644
index aec24e7..0000000
Binary files a/templates/boot/addons/hdt.c32 and /dev/null differ
diff --git a/templates/boot/addons/memdisk b/templates/boot/addons/memdisk
deleted file mode 100644
index de1eac6..0000000
Binary files a/templates/boot/addons/memdisk and /dev/null differ
diff --git a/templates/boot/addons/menu.c32 b/templates/boot/addons/menu.c32
deleted file mode 100644
index 1a6c996..0000000
Binary files a/templates/boot/addons/menu.c32 and /dev/null differ