From 6752a1634a369200feb5505ddee2183440808a27 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Tue, 14 Sep 2010 12:30:05 +0000
Subject: [PATCH]   * Update loadlin kernel parameters to match d-i values.
 Thanks to Samuel     Thibault for the patch. Closes: #594267

---
 debian/changelog            | 2 ++
 tools/boot/squeeze/boot-x86 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 329bd400..2487842a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ debian-cd (3.1.4) UNRELEASED; urgency=low
   * Include pciutils on installation CDs.
   * Only include a symlink for the suite actually specified in the
     Release file. Closes: #590993
+  * Update loadlin kernel parameters to match d-i values. Thanks to Samuel
+    Thibault for the patch. Closes: #594267
 
   [ Karl Goetz ]
   * Rename log.sort_deps* to sort_deps*.log for better consistency.
diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
index 3773de8d..91e9df67 100644
--- a/tools/boot/squeeze/boot-x86
+++ b/tools/boot/squeeze/boot-x86
@@ -250,7 +250,7 @@ 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
+		echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788" | todos > $CDDIR/$INSTALLDIR/gtk/install.bat
 
 	fi
 	rm -f boot$N/isolinux/isolinux.cfg.with*