Bug#767223: Dont append kernel params for isolinux/deskop filesin Jessie

[Prema <premum@gmail.com>]

Package: debian-cd

version: 3.1.16

Current Debian installer removed "desktop" folder under isolinux and merged it to head. But the debian-cd still searches for the "desktop/*cfg" files under isolinux folder.

The attached patch removes the search of desktop folder under Jessie.

--
Regards.,
Prema S

From 05cd81c42768a93800846f3f6bd31b28f91b685c Mon Sep 17 00:00:00 2001
From: Prema S <premas@cdac.in>
Date: Wed, 29 Oct 2014 17:50:57 +0530
Subject: [PATCH] Do not look for isolinux/desktop/*cfg files for appending
 kernel params for Jessie

---
 tools/boot/jessie/boot-x86 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
index e42dee0..bc549ac 100644
--- a/tools/boot/jessie/boot-x86
+++ b/tools/boot/jessie/boot-x86
@@ -364,7 +364,7 @@ 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)
-	for file in boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg; do
+	for file in boot$N/isolinux/*.cfg ; do
 		case "$(basename $file)" in
 			instsel.cfg)
 				continue ;;
-- 
2.1.1