diff --git a/debian/changelog b/debian/changelog index 184d920e..8e55dace 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,7 +51,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=low * Update tools/grab_md5 to use the same variable name (SUITE->CODENAME) as the rest of the code, to reduse confusion. - -- Frans Pop Thu, 26 Jul 2007 03:19:01 +0200 + [ Joey Hess ] + * Drop old with26 cruft for lenny. + + -- Joey Hess Wed, 01 Aug 2007 22:27:38 -0400 debian-cd (3.0.2) unstable; urgency=high diff --git a/tools/boot/lenny/boot-i386 b/tools/boot/lenny/boot-i386 index c9f09ff8..0ecc7355 100755 --- a/tools/boot/lenny/boot-i386 +++ b/tools/boot/lenny/boot-i386 @@ -175,18 +175,9 @@ if [ "$NN" = "1" ]; then # Isolinux setup including config and help files comes from d-i. cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx) - if [ -e boot$N/isolinux/f3.txt.with26+gtk ]; then - extra_image 2.6/initrd.gz - extra_image 2.6/vmlinuz - extra_image gtk/initrd.gz - syslinux_files with26+gtk - elif [ -e boot$N/isolinux/f3.txt.withgtk ]; then + if [ -e boot$N/isolinux/f3.txt.withgtk ]; then extra_image gtk/initrd.gz syslinux_files withgtk - elif [ -e boot$N/isolinux/f3.txt.with26 ];then - extra_image 2.6/initrd.gz - extra_image 2.6/vmlinuz - syslinux_files with26 fi rm -f boot$N/isolinux/isolinux.cfg.with* 2>/dev/null || true