Do not look for isolinux/desktop/*cfg files

d-i has removed these files now, so don't look for them for kernel
params. Closes: #767223, #766411. Thanks to Prema and Vagrant for
(identical!) patches. :-)
This commit is contained in:
Steve McIntyre 2014-10-29 17:28:12 +00:00
parent dceb0d9b67
commit 047b07e779
2 changed files with 6 additions and 1 deletions

5
debian/changelog vendored
View File

@ -12,6 +12,11 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
* Extend FORCE_SID_TASKSEL usage in update_tasks to also affect desktop
choice algorithm
* Add experimental support for arm64 booting via UEFI
* Use new tasksel interface to determine default desktop.
Closes: #762613
* Do not look for isolinux/desktop/*cfg files for appending
kernel params for Jessie. Closes: #767223, #766411. Thanks to Prema
and Vagrant for (identical!) patches. :-)
[ Philipp Hahn ]
* Fix word-splitting regexp in generate_di_list. Closes: #758512.

View File

@ -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 ;;