Use memdisk and hdt from syslinux-common package

diff --git a/debian/control b/debian/control
index 31c3845..3951d7c 100644 (file)
--- 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..b5c5268 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,14 +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
 

diff --git a/grml-live b/grml-live
index 17fb06c..789d487 100755 (executable)
--- 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 (file)
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 (file)
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 (file)
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 (file)
index 1a6c996..0000000
Binary files a/templates/boot/addons/menu.c32 and /dev/null differ