Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Workaround issue with isolinux on amd64/i386 multi-arch images 

Modify the syslinux configuration for amd64/i386 multi-arch images
and use ifcpu64.c32 to autodetect 32/64-bit systems when a user hits
enter from the isolinux help screens.

Based on research done and info provided by Franklin Piat.
This commit is contained in:
Frans Pop 2008-11-19 16:08:22 +00:00
parent c298b449cd
commit bc419dbf37
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -42,10 +42,13 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
* Fix i386/amd64 multi-arch support in the lenny x86 boot script so that the
isolinux config gets modified correctly independent of the order in which
the arches are specified.
* Workaround #505243 by modifying the syslinux configuration for amd64/i386
multi-arch images and using ifcpu64.c32 to autodetect 32/64-bit systems
when a user hits enter from the isolinux help screens. Based on research
done by Franklin Piat.
[ Steve McIntyre ]
* Stop copying the /tools/ directory on from the mirror; it's going
away.
* Stop copying the /tools/ directory on from the mirror; it's going away.
-- Frans Pop <fjp@debian.org> Thu, 13 Nov 2008 22:17:21 +0100

20
tools/boot/lenny/boot-x86
View File

@ -257,6 +257,26 @@ if [ "$THISTYPE" = "isolinux" ]; then
/^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
boot$N/win32-loader.ini
fi
# Workaround for #505243
# Syslinux does not correctly handle a default64 option
# in combination with vesamenu.
# Instead, add special default label to automatically select
# i386/amd64 if user hits enter from help screens.
cp -f $CDDIR/../syslinux/usr/lib/syslinux/ifcpu64.c32 boot$N/isolinux/
sed -i "/^default install/ s/^/#/" \
boot$N/isolinux/text.cfg
sed -i "/^default64 amd64-install/ s/^/#/" \
boot$N/isolinux/amdtext.cfg
sed -i "/^include menu.cfg/ a\include instsel.cfg" \
boot$N/isolinux/prompt.cfg
cat >boot$N/isolinux/instsel.cfg <<EOF
default install-select
label install-select
kernel ifcpu64.c32
append amd64-install -- install
EOF
# Workaround for #505243 ends here
fi
if [ "$SPLASHPNG" ] ; then