From: Michael Prokop <devnull@localhost>
Date: Sun, 9 Dec 2007 16:47:27 +0000 (+0100)
Subject: Ship syslinux files via template directory
X-Git-Tag: 0.0.12~11
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=5f75bf0b376147c45194e89d4014833536524698

Ship syslinux files via template directory
---

diff --git a/debian/changelog b/debian/changelog
index 1358f41..b0d8e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ grml-live (0.0.12) unstable; urgency=low
 
   * Log mkisofs command with quotes around version number for easier
     copy/paste.
+  * Ship syslinux files via template directory because the syslinux
+    version (1:3.31-4) in Debian/etch is broken. :(
 
  -- Michael Prokop <mika@grml.org>  Sun, 09 Dec 2007 17:28:01 +0100
 
diff --git a/debian/control b/debian/control
index 4953815..fe46d25 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://hg.grml.org/grml-live/
 
 Package: grml-live
 Architecture: all
-Depends: fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs, squashfs-tools, syslinux [i386 amd64], wget
+Depends: fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs, squashfs-tools, wget
 Suggests: fai-doc
 Description: build system for creating a grml (based) live-cd
  This package provides the build system for creating
diff --git a/debian/copyright b/debian/copyright
index 7199f16..7a189da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,6 +30,13 @@ License:
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+License information for the syslinux files shipped as
+/usr/share/grml-live/templates/boot/isolinux/:
+
+   Downloaded from <http://ftp.kernel.org/pub/linux/utils/boot/syslinux/>.
+   Upstream Author: H. Peter Anvin <hpa@zytor.com>
+   Copyright (C) 1994-2007 H. Peter Anvin <hpa@zytor.com>
+
 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 6c76805..87321a0 100755
--- a/grml-live
+++ b/grml-live
@@ -455,11 +455,6 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
          bailout 11
       fi
 
-      cp /usr/lib/syslinux/chain.c32     "$BUILD_OUTPUT"/boot/isolinux/
-      cp /usr/lib/syslinux/isolinux.bin  "$BUILD_OUTPUT"/boot/isolinux/
-      cp /usr/lib/syslinux/memdisk       "$BUILD_OUTPUT"/boot/isolinux/
-      cp /usr/lib/syslinux/menu.c32      "$BUILD_OUTPUT"/boot/isolinux/
-
       [ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
       if ! [ -d "${TEMPLATE_DIRECTORY}"/boot ] ; then
          log "${TEMPLATE_DIRECTORY}/boot does not exist. Exiting."
diff --git a/templates/boot/isolinux/chain.c32 b/templates/boot/isolinux/chain.c32
new file mode 100644
index 0000000..bb5d31f
Binary files /dev/null and b/templates/boot/isolinux/chain.c32 differ
diff --git a/templates/boot/isolinux/isolinux.bin b/templates/boot/isolinux/isolinux.bin
new file mode 100644
index 0000000..c4480ae
Binary files /dev/null and b/templates/boot/isolinux/isolinux.bin differ
diff --git a/templates/boot/isolinux/memdisk b/templates/boot/isolinux/memdisk
new file mode 100644
index 0000000..d968ecc
Binary files /dev/null and b/templates/boot/isolinux/memdisk differ
diff --git a/templates/boot/isolinux/menu.c32 b/templates/boot/isolinux/menu.c32
new file mode 100644
index 0000000..a227b76
Binary files /dev/null and b/templates/boot/isolinux/menu.c32 differ