Add support for a separate 'GNOME desktop environment' CD

This new task is mostly added for completeness. Main difference with
the default task file is that no server tasks are included.

debian/changelog

@@ -80,6 +80,9 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
     tasksel (GNOME, KDE, LXDE and Xfce). On x86 it will also add an option in
     the isolinux menu (under Advanced options) to select which DE to install,
     but GNOME will remain default.
+  * Add support for a separate 'GNOME desktop environment' CD.
+    This new task is mostly added for completeness. Main difference with the
+    default task file is that no server tasks are included.
 
  -- Frans Pop <fjp@debian.org>  Fri, 05 Dec 2008 10:04:03 +0100
 

easy-build.sh

@@ -6,7 +6,7 @@ set -e
 ## See also CONF.sh for the meaning of variables used here.
 
 show_usage() {
-	echo "Usage: $(basename $0) [-d kde|lxde|xfce|light|all] BC|NETINST|CD|DVD [<ARCH> ...]"
+	echo "Usage: $(basename $0) [-d gnome|kde|lxde|xfce|light|all] BC|NETINST|CD|DVD [<ARCH> ...]"
 }
 
 
@@ -27,11 +27,8 @@ fi
 desktop=
 if [ "$1" = "-d" ]; then
 	case $2 in
-	    gnome)
+	    # Note: "gnome" is the special gnome task, not the generic task
-		# Ignore (gnome is default)
+	    gnome|kde|lxde|xfce|light|all)
-		shift 2
-		;;
-	    kde|lxde|xfce|light|all)
 		desktop=$2
 		shift 2
 		;;

tasks/lenny/Debian-gnome

@@ -0,0 +1,19 @@
+/*
+ *
+ * This file will be used to build an official installation CD for Lenny
+ * that can be used to install the GNOME desktop environment and that does
+ * not include server tasks on CD1.
+ *
+ */
+
+/* Packages that should really be on CD1 */\
+#include <debian-installer+kernel>
+#include <forcd1>
+#include <task-essential-gnome>
+
+/* Other interesting packages */
+#include <task-full-gnome>
+#include <interesting-fromcd23>
+
+/* The rest ordered by popularity */
+#include <popularity-contest>

tasks/lenny/task.list.gnome

@@ -0,0 +1,3 @@
+gnome-desktop
+desktop
+laptop

tools/boot/lenny/boot-x86

@@ -141,6 +141,12 @@ extra_image () {
 # If multiple desktops are to be supported, set the default one
 ORIG_DESKTOP=
 case "$DESKTOP" in
+    gnome)
+	# gnome is default in tasksel 
+	DESKTOP=
+	KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
+		sed -r "s/desktop=[^ ]* ?//")"
+	;;
     all)
 	ORIG_DESKTOP=$DESKTOP
 	DESKTOP=

tools/boot/lenny/common.sh

@@ -10,10 +10,10 @@ DI_DIR="$(echo "$DI_DIR" | sed -e "s|%ARCH%|$ARCH|g")"
 # desktops; make sure other arches get a working config
 if [ "$ARCH" != i386 ] && [ "$ARCH" != amd64 ]; then
     case $DESKTOP in
-        all)
+        all|gnome)
             DESKTOP=
             KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | \
-                sed -r "s/desktop=all ?//")"
+                sed -r "s/desktop=[^ ]* ?//")"
             ;;
         light)
             DESKTOP=xfce

tools/update_tasks

@@ -165,7 +165,7 @@ dpkg -x $TASKSEL_DEB $TDIR/tasksel
 [ -e task.languages ] || exit 1
 grep -Ev "^(#.*)?[[:space:]]*$" task.languages > $TDIR/languages
 
-for variant in "" kde lxde xfce light all; do
+for variant in "" gnome kde lxde xfce light all; do
     if [ ! -e task.list${variant:+.$variant} ]; then
         echo "Warning: task.list${variant:+.$variant} does not exist; skipping"
 	continue