Fix i386/amd64 multi-arch support
Currently the isolinux configuration only gets created correctly if the two arches are specified in the order "amd64 i386". Change the lenny x86 boot script so it works the other way around too.
This commit is contained in:
Frans Pop
parent
a8f0d9d14b
commit
262e02ffca
|
|
@ -39,6 +39,9 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
|
||||||
farbror.
|
farbror.
|
||||||
* Clean up and update interesting-fromcd23 and exclude task files for lenny.
|
* Clean up and update interesting-fromcd23 and exclude task files for lenny.
|
||||||
* Fix error in expansion of %ARCH% variables in D-I image location envvars.
|
* Fix error in expansion of %ARCH% variables in D-I image location envvars.
|
||||||
|
* 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.
|
||||||
|
|
||||||
-- Frans Pop <fjp@debian.org> Thu, 13 Nov 2008 22:17:21 +0100
|
-- Frans Pop <fjp@debian.org> Thu, 13 Nov 2008 22:17:21 +0100
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -157,93 +157,107 @@ if [ "$THISTYPE" = "isolinux" ]; then
|
||||||
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
|
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
|
||||||
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
|
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
|
||||||
|
|
||||||
if [ "$ARCH" = i386 ]; then
|
|
||||||
ISOLINUXDIR=isolinux
|
|
||||||
|
|
||||||
# If the isolinux dir already exists, rename it aside for now
|
# In case of a multi-arch CD the script will be called two times.
|
||||||
if [ -e boot$N/isolinux/isolinux.cfg ] ; then
|
# The first time the isolinux dir gets set up for single arch; if
|
||||||
mv boot$N/isolinux boot$N/isolinux-amd64
|
# it is called a second time the isolinux dir already exists and we
|
||||||
|
# know it will be multi-arch. We then throw away the first version
|
||||||
|
# and just configure things from scratch for multi-arch.
|
||||||
|
|
||||||
|
MULTIARCH=
|
||||||
|
if [ -e boot$N/isolinux/isolinux.cfg ]; then
|
||||||
|
MULTIARCH=1
|
||||||
|
rm -r boot$N/isolinux
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
ISOLINUXDIR=isolinux-"$ARCH"
|
mkdir -p boot$N/isolinux
|
||||||
fi
|
|
||||||
mkdir -p boot$N/$ISOLINUXDIR
|
|
||||||
# Isolinux setup including config and help files comes from d-i.
|
# Isolinux setup including config and help files comes from d-i.
|
||||||
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/$ISOLINUXDIR/; tar zx)
|
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
|
||||||
|
|
||||||
# Not everything in the tarball is isolinux stuff
|
# Not everything in the tarball is isolinux stuff
|
||||||
if [ -e boot$N/$ISOLINUXDIR/win32-loader.ini ] ; then
|
if [ -e boot$N/isolinux/win32-loader.ini ] ; then
|
||||||
mv boot$N/$ISOLINUXDIR/g2ldr* boot$N/$ISOLINUXDIR/setup.exe \
|
mv boot$N/isolinux/g2ldr* boot$N/isolinux/setup.exe \
|
||||||
boot$N/$ISOLINUXDIR/win32-loader.ini boot$N/
|
boot$N/isolinux/win32-loader.ini boot$N/
|
||||||
fi
|
fi
|
||||||
if [ -e boot$N/$ISOLINUXDIR/f3.txt.withgtk ]; then
|
|
||||||
|
if [ -e boot$N/isolinux/f3.txt.withgtk ]; then
|
||||||
extra_image gtk/initrd.gz
|
extra_image gtk/initrd.gz
|
||||||
mv boot$N/$ISOLINUXDIR/f3.txt.withgtk boot$N/$ISOLINUXDIR/f3.txt
|
mv boot$N/isolinux/f3.txt.withgtk boot$N/isolinux/f3.txt
|
||||||
mv boot$N/$ISOLINUXDIR/f4.txt.withgtk boot$N/$ISOLINUXDIR/f4.txt
|
mv boot$N/isolinux/f4.txt.withgtk boot$N/isolinux/f4.txt
|
||||||
if [ -e boot$N/$ISOLINUXDIR/isolinux.cfg.withgtk ]; then
|
if [ -e boot$N/isolinux/isolinux.cfg.withgtk ]; then
|
||||||
mv boot$N/$ISOLINUXDIR/isolinux.cfg.withgtk boot$N/$ISOLINUXDIR/isolinux.cfg
|
mv boot$N/isolinux/isolinux.cfg.withgtk boot$N/isolinux/isolinux.cfg
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Remove gtk isolinux config files.
|
# Remove gtk isolinux config files.
|
||||||
# FJP: AFAICT this is redundant: if f3.txt.withgtk is not
|
# FJP: AFAICT this is redundant: if f3.txt.withgtk is not
|
||||||
# included then the *gtk* files will not be either.
|
# included then the *gtk* files will not be either.
|
||||||
rm -f boot$N/$ISOLINUXDIR/gtk.cfg
|
rm -f boot$N/isolinux/gtk.cfg
|
||||||
rm -f boot$N/$ISOLINUXDIR/amdgtk.cfg
|
rm -f boot$N/isolinux/amdgtk.cfg
|
||||||
rm -f boot$N/$ISOLINUXDIR/adgtk.cfg
|
rm -f boot$N/isolinux/adgtk.cfg
|
||||||
rm -f boot$N/$ISOLINUXDIR/adamdgtk.cfg
|
rm -f boot$N/isolinux/adamdgtk.cfg
|
||||||
fi
|
fi
|
||||||
rm -f boot$N/$ISOLINUXDIR/isolinux.cfg.with* 2>/dev/null || true
|
rm -f boot$N/isolinux/isolinux.cfg.with*
|
||||||
|
|
||||||
for f in text.cfg gtk.cfg adtext.cfg adgtk.cfg; do
|
# Modify win32-loader.ini for the "current" arch
|
||||||
if [ -e boot$N/$ISOLINUXDIR/$f ]; then
|
if [ -e boot$N/win32-loader.ini ]; then
|
||||||
sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
for f in amdtext.cfg amdgtk.cfg adamdtext.cfg adamdgtk.cfg; do
|
|
||||||
if [ -e boot$N/$ISOLINUXDIR/$f ]; then
|
|
||||||
sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/$ISOLINUXDIR/$f
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -e boot$N/win32-loader.ini ] ; then
|
|
||||||
sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini
|
sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini
|
||||||
if [ "${DESKTOP}" ] ; then
|
if [ "${DESKTOP}" ] ; then
|
||||||
sed -i "s|^\(default_desktop\)=.*|\1=${DESKTOP}|" boot$N/win32-loader.ini
|
sed -i "s|^\(default_desktop\)=.*|\1=${DESKTOP}|" boot$N/win32-loader.ini
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp -f $CDDIR/../syslinux/usr/lib/syslinux/isolinux.bin boot$N/$ISOLINUXDIR/
|
cp -f $CDDIR/../syslinux/usr/lib/syslinux/isolinux.bin boot$N/isolinux/
|
||||||
cp -f $CDDIR/../syslinux/usr/lib/syslinux/vesamenu.c32 boot$N/$ISOLINUXDIR/
|
cp -f $CDDIR/../syslinux/usr/lib/syslinux/vesamenu.c32 boot$N/isolinux/
|
||||||
|
|
||||||
|
# FIXME - this is broken for the current setup which no longer
|
||||||
|
# has a 'default' statement in isolinux.cfg
|
||||||
if [ -n "$ISOLINUX_DEFAULT" ]; then
|
if [ -n "$ISOLINUX_DEFAULT" ]; then
|
||||||
sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" boot$N/$ISOLINUXDIR/isolinux.cfg
|
sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" \
|
||||||
|
boot$N/isolinux/isolinux.cfg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Handle merging amd64 and i386 isolinux dirs if both are present.
|
if [ -z "$MULTIARCH" ]; then
|
||||||
if [ -e boot$N/isolinux-amd64/isolinux.cfg ] && [ -e boot$N/isolinux/isolinux.cfg ]; then
|
# Set up isolinux dir for only the current arch
|
||||||
for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
|
for f in text.cfg gtk.cfg adtext.cfg adgtk.cfg; do
|
||||||
sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
|
if [ -e boot$N/isolinux/$f ]; then
|
||||||
|
sed -i "s|/install/|/$INSTALLDIR/|" boot$N/isolinux/$f
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
sed -i -e "/^arch=/d
|
|
||||||
/^i386\//p
|
|
||||||
s/^i386\//amd64\//
|
|
||||||
s/=$INSTALLDIR_i386\//=$INSTALLDIR_amd64\//g" \
|
|
||||||
boot$N/win32-loader.ini
|
|
||||||
|
|
||||||
else
|
|
||||||
if [ "$ARCH" = amd64 ]; then
|
|
||||||
mkdir -p boot$N/isolinux
|
|
||||||
mv -f boot$N/isolinux-amd64/* boot$N/isolinux
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove the *amd*.cfg files to avoid them being loaded on a
|
# Remove the *amd*.cfg files to avoid them being loaded on a
|
||||||
# disc that does not have both amd64 and i386 dirs.
|
# disc that does not have both amd64 and i386 dirs.
|
||||||
rm -f boot$N/isolinux/amdtext.cfg
|
rm -f boot$N/isolinux/amdtext.cfg
|
||||||
rm -f boot$N/isolinux/amdgtk.cfg
|
rm -f boot$N/isolinux/amdgtk.cfg
|
||||||
rm -f boot$N/isolinux/adamdtext.cfg
|
rm -f boot$N/isolinux/adamdtext.cfg
|
||||||
rm -f boot$N/isolinux/adamdgtk.cfg
|
rm -f boot$N/isolinux/adamdgtk.cfg
|
||||||
|
else
|
||||||
|
# Set up isolinux dir for multi-arch
|
||||||
|
for f in text.cfg gtk.cfg adtext.cfg adgtk.cfg; do
|
||||||
|
if [ -e boot$N/isolinux/$f ]; then
|
||||||
|
sed -i "s|/install/|/$INSTALLDIR_i386/|" boot$N/isolinux/$f
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
for f in amdtext.cfg amdgtk.cfg adamdtext.cfg adamdgtk.cfg; do
|
||||||
|
if [ -e boot$N/isolinux/$f ]; then
|
||||||
|
sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/isolinux/$f
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
|
||||||
|
sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
|
||||||
|
done
|
||||||
|
|
||||||
|
# Modify win32-loader.ini to also cover the "other" arch
|
||||||
|
if [ "$ARCH" = i386 ]; then
|
||||||
|
sed -i -e "/^arch=/d
|
||||||
|
/^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
|
||||||
|
boot$N/win32-loader.ini
|
||||||
|
else
|
||||||
|
sed -i -e "/^arch=/d
|
||||||
|
/^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
|
||||||
|
boot$N/win32-loader.ini
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
rm -rf boot$N/isolinux-amd64
|
|
||||||
|
|
||||||
if [ "$SPLASHPNG" ] ; then
|
if [ "$SPLASHPNG" ] ; then
|
||||||
# Insert our own splash screen. Color index 0 is
|
# Insert our own splash screen. Color index 0 is
|
||||||
|
|
@ -261,7 +275,6 @@ if [ "$THISTYPE" = "isolinux" ]; then
|
||||||
sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
|
sed -i "/^[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" \
|
||||||
boot$N/isolinux/*.cfg
|
boot$N/isolinux/*.cfg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
if [ -n "$THISTYPE" ]; then
|
if [ -n "$THISTYPE" ]; then
|
||||||
echo "Using $THISTYPE boot-disks image on CD$N"
|
echo "Using $THISTYPE boot-disks image on CD$N"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue