merge SPLASHPNG patch from debian-edu branch

CONF.sh

@@ -42,7 +42,7 @@ unset BASE_EXCLUDE      || true
 unset INSTALLER_CD      || true
 unset DI_CODENAME       || true
 unset MAXCDS            || true
-
+unset SPLASHPNG         || true
 
 # The debian-cd dir
 # Where I am (hoping I'm in the debian-cd dir)
@@ -276,6 +276,9 @@ export PUBLISH_PATH="/home/jigdo-area/"
 # If set, limits the number of binary CDs to produce.
 #export MAXCDS=1
 
+# If set, overrides the boot picture used.
+#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
+
 # Used by build.sh to determine what to build, this is the name of a target
 # in the Makefile. Use bin-official_images to build only binary CDs. The
 # default, official_images, builds everything.

debian/CONF.sh

@@ -42,7 +42,7 @@ unset BASE_EXCLUDE      || true
 unset INSTALLER_CD      || true
 unset DI_CODENAME       || true
 unset MAXCDS            || true
-
+unset SPLASHPNG         || true
 
 # The debian-cd dir
 # Where I am (hoping I'm in the debian-cd dir)
@@ -276,6 +276,9 @@ export PUBLISH_PATH="/home/jigdo-area/"
 # If set, limits the number of binary CDs to produce.
 #export MAXCDS=1
 
+# If set, overrides the boot picture used.
+#export SPLASHPNG="$BASEDIR/data/$CODENAME/splash-img.png"
+
 # Used by build.sh to determine what to build, this is the name of a target
 # in the Makefile. Use bin-official_images to build only binary CDs. The
 # default, official_images, builds everything.

debian/changelog

@@ -12,6 +12,8 @@ debian-cd (2.2.20) UNRELEASED; urgency=low
   * Stephen R. Marenka
     - Add support for m68k reorganization.
     - Bump m68k 2.4 kernels to 2.4.27.
+  * Petter Reinholdtsen
+    - New variable SPLASHPNG pointing to replacement splash image on i386.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 30 Aug 2004 15:23:19 -0400
 

tools/boot/sarge/boot-i386

@@ -175,6 +175,14 @@ if [ "$NN" = "1" ]; then
 	else 
 		write_isolinux_config
 	fi
+
+	if [ "$SPLASHPNG" ] ; then
+		# Insert our own splash screen.  Color index 15 is
+		# background, and index 7 is foreground.  Set to black and
+		# white respecively
+		pngtopnm < $SPLASHPNG | ppmquant 16 | \
+			ppmtolss16 "#ffffff=7" "#000000=15" > boot$N/isolinux/splash.rle
+	fi
 fi
 
 # write final lines to mkisofs_opts