From f007eaed9d95ed33cea94bb541f76e4c51e9f448 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Wed, 12 Jun 2013 23:59:33 +0100
Subject: [PATCH] Build without isolinux/desktop. Closes: #706150

debian-cd currently expects there to always be isolinux/desktop/*
files and a dtmenu.cfg file, failing if they are missing. Make it so
debian-cd can cope whether those files are present or not.
---
 debian/changelog                 |  4 ++++
 tools/boot/jessie/boot-x86       |  9 +++------
 tools/boot/jessie/x86-desktop.sh | 10 ++++++----
 tools/boot/wheezy/boot-x86       |  9 +++------
 tools/boot/wheezy/x86-desktop.sh | 10 ++++++----
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78563901..40279761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 debian-cd (3.1.14) UNRELEASED; urgency=low
 
+  [ Steve McIntyre ]
   * Start jessie work; copy things from the wheezy config for now.
   * Remove older squeeze, lenny, etch dirs
   * Move code hosting from svn to git.
 
+  [ Robert Spencer ]
+  * Build without isolinux/desktop. Closes: #706150
+
  -- Steve McIntyre <93sam@debian.org>  Mon, 06 May 2013 23:26:18 +0100
 
 debian-cd (3.1.13) unstable; urgency=medium
diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
index afd1024f..6c65cdbb 100644
--- a/tools/boot/jessie/boot-x86
+++ b/tools/boot/jessie/boot-x86
@@ -284,17 +284,14 @@ fi
 
 if [ -z "$MULTIARCH" ]; then
 	# Set up isolinux dir for only the current arch
-	sed -i "s|%install%|$INSTALLDIR|" \
-		boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|"
     
 	# Remove the amd*.cfg files to avoid them being loaded on a
 	# disc that does not have both amd64 and i386 dirs.
-	rm -f boot$N/isolinux/amd*.cfg boot$N/isolinux/desktop/amd*.cfg
+	find boot$N/isolinux/ -name "amd*.cfg" -delete
 else
 	# Set up isolinux dir for multi-arch
-	sed -i "s|%install%|$INSTALLDIR_i386|
-			s|%install-amd%|$INSTALLDIR_amd64|" \
-			    boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install[-amd]*%' boot$N/isolinux/* | xargs -r sed -i -e "s|%install%|$INSTALLDIR_i386|" -e "s|%install-amd%|$INSTALLDIR_amd64|"
 
 	for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
 		sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
diff --git a/tools/boot/jessie/x86-desktop.sh b/tools/boot/jessie/x86-desktop.sh
index 07abb3fd..002e6226 100644
--- a/tools/boot/jessie/x86-desktop.sh
+++ b/tools/boot/jessie/x86-desktop.sh
@@ -22,8 +22,10 @@ multiarch_workaround() {
 		boot$N/isolinux/amdtxt.cfg || true
 	sed -i "/^include menu.cfg/ a\include instsel.cfg" \
 		boot$N/isolinux/prompt.cfg
-	sed -i "/^default install/ a\include instsel.cfg" \
-		boot$N/isolinux/desktop/prompt.cfg
+	if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then
+		sed -i "/^default install/ a\include instsel.cfg" \
+			boot$N/isolinux/desktop/prompt.cfg
+	fi
 	cat >boot$N/isolinux/instsel.cfg <<EOF
 default install-select
 label install-select
@@ -48,8 +50,8 @@ create_desktop_dir() {
 
 modify_for_single_desktop() {
 	# Cleanup
-	rm boot$N/isolinux/dtmenu.cfg
-	rm -r boot$N/isolinux/desktop
+	rm -f boot$N/isolinux/dtmenu.cfg
+	rm -fr boot$N/isolinux/desktop
 
 	# Set default desktop, or remove if not applicable
 	if [ "$DESKTOP" ]; then
diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index afd1024f..6c65cdbb 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -284,17 +284,14 @@ fi
 
 if [ -z "$MULTIARCH" ]; then
 	# Set up isolinux dir for only the current arch
-	sed -i "s|%install%|$INSTALLDIR|" \
-		boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|"
     
 	# Remove the amd*.cfg files to avoid them being loaded on a
 	# disc that does not have both amd64 and i386 dirs.
-	rm -f boot$N/isolinux/amd*.cfg boot$N/isolinux/desktop/amd*.cfg
+	find boot$N/isolinux/ -name "amd*.cfg" -delete
 else
 	# Set up isolinux dir for multi-arch
-	sed -i "s|%install%|$INSTALLDIR_i386|
-			s|%install-amd%|$INSTALLDIR_amd64|" \
-			    boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+	grep -lr '%install[-amd]*%' boot$N/isolinux/* | xargs -r sed -i -e "s|%install%|$INSTALLDIR_i386|" -e "s|%install-amd%|$INSTALLDIR_amd64|"
 
 	for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
 		sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
diff --git a/tools/boot/wheezy/x86-desktop.sh b/tools/boot/wheezy/x86-desktop.sh
index 07abb3fd..002e6226 100644
--- a/tools/boot/wheezy/x86-desktop.sh
+++ b/tools/boot/wheezy/x86-desktop.sh
@@ -22,8 +22,10 @@ multiarch_workaround() {
 		boot$N/isolinux/amdtxt.cfg || true
 	sed -i "/^include menu.cfg/ a\include instsel.cfg" \
 		boot$N/isolinux/prompt.cfg
-	sed -i "/^default install/ a\include instsel.cfg" \
-		boot$N/isolinux/desktop/prompt.cfg
+	if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then
+		sed -i "/^default install/ a\include instsel.cfg" \
+			boot$N/isolinux/desktop/prompt.cfg
+	fi
 	cat >boot$N/isolinux/instsel.cfg <<EOF
 default install-select
 label install-select
@@ -48,8 +50,8 @@ create_desktop_dir() {
 
 modify_for_single_desktop() {
 	# Cleanup
-	rm boot$N/isolinux/dtmenu.cfg
-	rm -r boot$N/isolinux/desktop
+	rm -f boot$N/isolinux/dtmenu.cfg
+	rm -fr boot$N/isolinux/desktop
 
 	# Set default desktop, or remove if not applicable
 	if [ "$DESKTOP" ]; then