diff --git a/debian/changelog b/debian/changelog index fe15b02d..c61039fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ debian-cd (3.0.1) UNRELEASED; urgency=low * Use the 64 bit autodetection feature of syslinux 3.31-2, if available, to default to the 64 bit target in multiarch isos. * Updated isolinux.bin to the version from syslinux 3.31-2. + * Temporarily disable use of 64 bit detection due to syslinx's bug #410729. -- Joey Hess Fri, 9 Feb 2007 23:44:25 -0500 diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386 index d9feaee9..3fd14049 100755 --- a/tools/boot/etch/boot-i386 +++ b/tools/boot/etch/boot-i386 @@ -215,8 +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 ' - /^DEFAULT/ { printf("DEFAULT64 amd64-%s\n", $2) } /^LABEL/ { printf("LABEL amd64-%s\n", $2) } /kernel/ { print $0 } /append/ { print $0 }' >> boot$N/isolinux/isolinux.cfg