From 7b1b3973f8595819ab7d5d4a2423787655d2fbe3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Mar 2007 19:18:45 +0000 Subject: [PATCH] * Updated isolinux.bin to the version from syslinux 3.31-3. * Re-enable use of 64 bit detection, fixed now. --- data/etch/isolinux.bin | Bin 10952 -> 10920 bytes debian/changelog | 6 +++++- tools/boot/etch/boot-i386 | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/etch/isolinux.bin b/data/etch/isolinux.bin index 82be335a39393ad55124411b5b2403c342613501..9fd7f63660ff6e7d29f2b107d9e6d8cb6d5d516b 100644 GIT binary patch delta 2491 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 G>wf_xsw9{I diff --git a/debian/changelog b/debian/changelog index 16a57d7f..908ba986 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,7 +33,11 @@ debian-cd (3.0.1) UNRELEASED; urgency=low the multi-arch DVD overflowing. Also log if we're doing HFS. * Tweak where we look for s390 boot files to make the weeklies work again. - -- Raphael Hertzog Wed, 21 Feb 2007 12:30:27 +0100 + [ Joey Hess ] + * Updated isolinux.bin to the version from syslinux 3.31-3. + * Re-enable use of 64 bit detection, fixed now. + + -- Joey Hess Thu, 1 Mar 2007 14:17:09 -0500 debian-cd (3.0.0) unstable; urgency=medium diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386 index 3fd14049..854cc192 100755 --- a/tools/boot/etch/boot-i386 +++ b/tools/boot/etch/boot-i386 @@ -215,10 +215,9 @@ if [ "$NN" = "1" ]; then mv $file.tmp $file done - # Temporarily removed from below awk due to #410729 - # /^DEFAULT/ { printf("DEFAULT64 amd64-%s\n", $2) } cat boot$N/isolinux-amd64/isolinux.cfg | awk ' /^LABEL/ { printf("LABEL amd64-%s\n", $2) } + /^DEFAULT/ { printf("DEFAULT64 amd64-%s\n", $2) } /kernel/ { print $0 } /append/ { print $0 }' >> boot$N/isolinux/isolinux.cfg