Re: [PATCH 1/4] boot-x86: move creation of install.bat out of extra_image
On Friday 07 August 2009, Ian Campbell wrote:
> There is currently only a single caller but soon I will be adding
> another which does not want install.bat created.
> ---
> tools/boot/squeeze/boot-x86 | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
> index 29f5566..0892ed7 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*
Why was $kernel_param (which was conditional on regular versus gtk)
replaced with a hardcoded "video=vesa:ywrap,mtrr vga=788"?
Reply to: