From 83ac3d95a3a66a261c8fbd99f56679646f4a6df4 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Sun, 8 Jun 2008 22:13:42 +0000
Subject: [PATCH] Add support for custom kernel params for all isolinux
 configurations

---
 tools/boot/lenny/boot-x86 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86
index b0023a50..96e271d4 100644
--- a/tools/boot/lenny/boot-x86
+++ b/tools/boot/lenny/boot-x86
@@ -208,12 +208,6 @@ if [ "$THISTYPE" = "isolinux" ]; then
 	cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/$ISOLINUXDIR/
 	cp -f $BASEDIR/data/$DI_CODENAME/vesamenu.c32 boot$N/$ISOLINUXDIR/
 
-	if [ -n "$KERNEL_PARAMS" ]; then
-		# Substitute custom kernel params into the isolinux config
-		# file.
-		sed -i "s|append |append $KERNEL_PARAMS |" boot$N/$ISOLINUXDIR/isolinux.cfg
-	fi
-
 	if [ -n "$ISOLINUX_DEFAULT" ]; then
 		sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" boot$N/$ISOLINUXDIR/isolinux.cfg
 	fi
@@ -274,6 +268,13 @@ if [ "$THISTYPE" = "isolinux" ]; then
 	fi
 
 	sed -i "s|built on|built $BUILD_DATE; d-i|" boot$N/isolinux/f1.txt
+
+	if [ -n "$KERNEL_PARAMS" ]; then
+		# Substitute custom kernel params into the isolinux config
+		# file(s)
+        sed -i "/[[:space:]]\+append .*--/ s|append|append $KERNEL_PARAMS|" boot$N/$ISOLINUXDIR/*.cfg
+	fi
+
 else
 	if [ -n "$THISTYPE" ]; then
 		echo "Using $THISTYPE boot-disks image on CD$N"