From fbdb7b30fd8bc4e4cc340f76640662359b77a47f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 10 Sep 2007 17:47:16 +0000 Subject: [PATCH] * Applied patch from Robert Millan to integrate win32-loader. Closes: #440220. --- debian/changelog | 7 ++++++- tools/boot/lenny/boot-x86 | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d987f94..c1d4b0ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ debian-cd (3.0.4) UNRELEASED; urgency=low + [ Frans Pop ] * Disable debugging output in boot scripts. - -- Frans Pop Sun, 02 Sep 2007 19:17:38 +0200 + [ Otavio Salvador ] + * Applied patch from Robert Millan to integrate + win32-loader. Closes: #440220. + + -- Otavio Salvador Mon, 10 Sep 2007 13:43:04 -0300 debian-cd (3.0.3) unstable; urgency=low diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86 index 5863edd0..9204dc23 100644 --- a/tools/boot/lenny/boot-x86 +++ b/tools/boot/lenny/boot-x86 @@ -55,10 +55,13 @@ KTYPE[10]="" THISTYPE=${KTYPE[$NN]} +INSTALLDIR_i386="install.386" +INSTALLDIR_amd64="install.amd" + if [ "$ARCH" = i386 ]; then - INSTALLDIR="install.386" + INSTALLDIR="$INSTALLDIR_i386" else - INSTALLDIR="install.amd" + INSTALLDIR="$INSTALLDIR_amd64" fi BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz" @@ -168,6 +171,8 @@ if [ "$THISTYPE" = "isolinux" ]; then mkdir -p boot$N/$ISOLINUXDIR # Isolinux setup including config and help files comes from d-i. cat cdrom/debian-cd_info.tar.gz | (cd boot$N/$ISOLINUXDIR/; tar zx) + # Not everything in the tarball is isolinux stuff + mv boot$N/$ISOLINUXDIR/{g2ldr*,setup.exe,win32-loader.ini} boot$N/ if [ -e boot$N/$ISOLINUXDIR/f3.txt.withgtk ]; then extra_image gtk/initrd.gz mv boot$N/$ISOLINUXDIR/f3.txt.withgtk boot$N/$ISOLINUXDIR/f3.txt @@ -178,6 +183,8 @@ if [ "$THISTYPE" = "isolinux" ]; then sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/isolinux.cfg + sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini + cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/$ISOLINUXDIR/ if [ -n "$KERNEL_PARAMS" ]; then @@ -207,6 +214,9 @@ if [ "$THISTYPE" = "isolinux" ]; then /[Kk][Ee][Rr][Nn][Ee][Ll]/ { print $0 } /[Aa][Pp][Pp][Ee][Nn][Dd]/ { print $0 }' >> boot$N/isolinux/isolinux.cfg + 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