Fix up Gnome CD set installing xfce; Closes: #756774

debian/changelog

@@ -2,6 +2,8 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
 
   [ Steve McIntyre ]
   * Fix changelog date for 3.1.15. Closes: #751814
+  * Fix up Gnome CD set installing xfce - logic in boot menu creation was
+    broken. Closes: #756774
 
  -- Steve McIntyre <93sam@debian.org>  Thu, 07 Aug 2014 01:45:01 +0100
 

tools/boot/jessie/common.sh

@@ -30,18 +30,15 @@ UNSPEC_DESKTOP_DEFAULT="$($BASEDIR/tools/apt-selection cache depends task-deskto
 # Only i386 and amd64 support desktop selection with the 'light' and 'all'
 # desktops; make sure other arches get a working config
 if [ "$ARCH" != i386 ] && [ "$ARCH" != amd64 ]; then
-    case $DESKTOP in
-        all|gnome)
-            DESKTOP=
-            KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
+    if [ "$DESKTOP" = all ] || [ "$DESKTOP" = "$UNSPEC_DESKTOP_DEFAULT" ] ; then
+        DESKTOP=
+        KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
                 sed -r "s/desktop=[^ ]* ?//")"
-            ;;
-        light)
-            DESKTOP=xfce
-            KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
+    elif [ "$DESKTOP" = light ] ; then
+        DESKTOP=xfce
+        KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
                 sed -r "s/(desktop=)light/\1xfce/")"
-            ;;
-    esac
+    fi
 fi
 
 

tools/boot/jessie/x86-desktop.sh

@@ -45,6 +45,7 @@ create_desktop_dir() {
 		kde)	title=KDE ;;
 		xfce)	title=Xfce ;;
 		lxde)	title=LXDE ;;
+		gnome)	title=Gnome ;;
 	esac
 
 	cp -r boot$N/isolinux/desktop boot$N/isolinux/$desktop
@@ -139,8 +140,10 @@ modify_for_all_desktop() {
 	done
 	sed -i "s/desktop=%desktop% //" boot$N/isolinux/*.cfg
 
-	for desktop in kde xfce lxde; do
-		create_desktop_dir $desktop
+	for desktop in kde xfce lxde gnome; do
+		if [ $desktop != $UNSPEC_DESKTOP_DEFAULT ] ; then
+			create_desktop_dir $desktop
+		fi
 	done
 
 	# Cleanup