From bee30ee646c9e0e3f032e1c197e6ec4d03fbd1db Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Sun, 9 Aug 2009 14:32:45 +0000 Subject: [PATCH] boot-x86: move creation of install.bat out of extra_image Patch from Ian Campbell. --- tools/boot/squeeze/boot-x86 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86 index 842e9910..1ab405a6 100644 --- a/tools/boot/squeeze/boot-x86 +++ b/tools/boot/squeeze/boot-x86 @@ -145,9 +145,6 @@ extra_image () { else wget "$DI_WWW_HOME/cdrom/$image" -O $CDDIR/$INSTALLDIR/"$image" fi - kernel_param= - [ "$dir" = gtk ] && kernel_param="video=vesa:ywrap,mtrr vga=788" - echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz $kernel_param" | todos > $CDDIR/$INSTALLDIR/$dir/install.bat fi } @@ -236,6 +233,8 @@ if [ "$THISTYPE" = "isolinux" ]; then if [ -e boot$N/isolinux/isolinux.cfg.withgtk ]; then mv boot$N/isolinux/isolinux.cfg.withgtk boot$N/isolinux/isolinux.cfg fi + echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz video=vesa:ywrap,mtrr vga=788" | todos > $CDDIR/$INSTALLDIR/gtk/install.bat + fi rm -f boot$N/isolinux/isolinux.cfg.with*