* Add extra text to boot messages on powerpc to tell people about how to

select a different desktop. Thanks to Rick Thomas for the
    text. Tweaked slightly to list the default on the current disc too.

data/wheezy/yaboot/boot.msg

@@ -15,4 +15,13 @@ Press TAB for a full list of options.
 If the system fails to boot with a white screen
 which doesn't go away, add 'video=ofonly'.
 
+The following desktop environments are available:
+gnome, kde, xfce and lxde.  The default is ${DEFAULT_DESKTOP}.
+If you prefer a different one, append
+    "desktop=<your choice>"
+e.g. to do an expert install with the xfce desktop
+environment, type
+    "expert desktop=xfce"
+at the "boot:" prompt.
+
 

data/wheezy/yaboot/boot32.msg

@@ -9,8 +9,15 @@ full list of options.
 
 
 If the system fails to boot with a white screen
-which doesn't go away, type: 
+which doesn't go away, try: 
 
 install video=ofonly 
 
-
+The following desktop environments are available:
+gnome, kde, xfce and lxde.  The default is ${DEFAULT_DESKTOP}.
+If you prefer a different one, append
+    "desktop=<your choice>"
+e.g. to do an expert install with the xfce desktop
+environment, type
+    "expert desktop=xfce"
+at the "boot:" prompt.

debian/changelog

@@ -45,6 +45,9 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
   * Update all the relevant boot-* scripts to do the right thing when
     extracting packages and sources, depending on
     $ARCHIVE_EXTRACTED_SOURCES as above
+  * Add extra text to boot messages on powerpc to tell people about how to
+    select a different desktop. Thanks to Rick Thomas for the
+    text. Tweaked slightly to list the default on the current disc too.
 
  -- Steve McIntyre <93sam@debian.org>  Wed, 26 Sep 2012 01:09:13 +0100
 

tools/boot/wheezy/boot-powerpc

@@ -80,6 +80,11 @@ fi
 
 cp $BASEDIR/data/$DI_CODENAME/yaboot/ofboot.b ofboot.b
 
+if [ "$DESKTOP"x = ""x ] || [ "$DESKTOP"x = "all"x ] ; then
+    DEFAULT_DESKTOP="$UNSPEC_DESKTOP_DEFAULT"
+else
+    DEFAULT_DESKTOP="$DESKTOP"
+
 for subarch in powerpc powerpc64 #prep
 do
   case $subarch in
@@ -100,9 +105,10 @@ do
    > $yabootconf
 
   cat $BASEDIR/data/$DI_CODENAME/yaboot/$yabootmsg \
-   | sed "s/\${MEDIA_TYPE}/CDROM/" \
+   | sed "s/\${MEDIA_TYPE}/${DISKTYPE}/" \
    | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
    | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
+   | sed "s/\${DEFAULT_DESKTOP}/${DEFAULT_DESKTOP}/g" \
    > $yabootmsg
 
   if [ -n "$KERNEL_PARAMS" ]; then