Split out code for workaround for #505243 to x86-desktop function library

Cleans up the main boot-x86 script a bit.

debian/changelog

@@ -5,6 +5,7 @@ debian-cd (3.1.3) UNRELEASED; urgency=low
     is a backport of what was already implemented in debian-cd before the
     release of Lenny and allows a significant simplification.
     There are no significant changes in generated CD/DVD images.
+  * Split out code for workaround for #505243 to x86-desktop function library.
 
  -- Frans Pop <fjp@debian.org>  Mon, 01 Jun 2009 00:15:59 +0200
 

tools/boot/squeeze/boot-x86

@@ -264,27 +264,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
 				boot$N/win32-loader.ini
 		fi
 
-		# Workaround for #505243
-		# Syslinux does not correctly handle a default64 option
-		# in combination with vesamenu.
-		# Instead, add special default label to automatically select
-		# i386/amd64 if user hits enter from help screens.
-		cp -f $CDDIR/../syslinux/usr/lib/syslinux/ifcpu64.c32 boot$N/isolinux/
-		sed -i "/^default install/ s/^/#/" \
-			boot$N/isolinux/txt.cfg || true
-		sed -i "/^default64 amd64-install/ s/^/#/" \
-			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
-		cat >boot$N/isolinux/instsel.cfg <<EOF
-default install-select
-label install-select
-    kernel ifcpu64.c32
-    append amd64-install -- install
-EOF
-		# Workaround for #505243 ends here
+		# Apply workaround for #505243
+		multiarch_workaround
 	fi
 
 	if [ "$SPLASHPNG" ] ; then

tools/boot/squeeze/x86-desktop.sh

@@ -1,6 +1,28 @@
 # Functions to convert isolinux config to allow selection of desktop
 # environment for certain images.
 
+# Workaround for #505243
+# Syslinux does not correctly handle a default64 option in combination
+# with vesamenu. Instead, add special default label to automatically
+# select i386/amd64 if user hits enter from help screens.
+multiarch_workaround() {
+	cp -f $CDDIR/../syslinux/usr/lib/syslinux/ifcpu64.c32 boot$N/isolinux/
+	sed -i "/^default install/ s/^/#/" \
+		boot$N/isolinux/txt.cfg || true
+	sed -i "/^default64 amd64-install/ s/^/#/" \
+		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
+	cat >boot$N/isolinux/instsel.cfg <<EOF
+default install-select
+label install-select
+    kernel ifcpu64.c32
+    append amd64-install -- install
+EOF
+}
+
 create_desktop_dir() {
 	local desktop=$1 title