Drop support for ISOLINUX_DEFAULT
This environment variable was used by simple-cdd to force the default installation option to the graphical installer. Now that we have the syslinux VESA menu, the option has become rather pointless. See #512303 for discussion.
This commit is contained in:
parent
09b01e685a
commit
5032d25183
|
@ -4,6 +4,8 @@ debian-cd (3.1.1) UNRELEASED; urgency=low
|
|||
* sparc: ensure the default 'install' option also gets KERNEL_PARAMS set.
|
||||
* start_new_disc: fix a typo so that DISC_PKG_HOOK might work. Thanks to
|
||||
Jonathan Hall for the patch. Closes: #513421
|
||||
* boot-x86: drop support for no longer really useful ISOLINUX_DEFAULT
|
||||
environment variable (see #512303 for discussion).
|
||||
|
||||
-- Frans Pop <fjp@debian.org> Tue, 20 Jan 2009 01:30:11 +0100
|
||||
|
||||
|
|
|
@ -234,13 +234,6 @@ if [ "$THISTYPE" = "isolinux" ]; then
|
|||
cp -f $CDDIR/../syslinux/usr/lib/syslinux/isolinux.bin boot$N/isolinux/
|
||||
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
|
||||
sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" \
|
||||
boot$N/isolinux/isolinux.cfg
|
||||
fi
|
||||
|
||||
if [ -z "$MULTIARCH" ]; then
|
||||
# Set up isolinux dir for only the current arch
|
||||
# Last two for Lenny RC1 compatibility
|
||||
|
|
Loading…
Reference in New Issue