* Updated isolinux.bin to the version from syslinux 3.31-3.

* Re-enable use of 64 bit detection, fixed now.
This commit is contained in:
Joey Hess 2007-03-01 19:18:45 +00:00
parent f1ad7563ee
commit 7b1b3973f8
3 changed files with 6 additions and 3 deletions

Binary file not shown.

6
debian/changelog vendored
View File

@ -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 <hertzog@debian.org> 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 <joeyh@debian.org> Thu, 1 Mar 2007 14:17:09 -0500
debian-cd (3.0.0) unstable; urgency=medium

View File

@ -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