* Applied patches that are being in use at O.S. Systems and that are

useful to others:
  - allow to use different name for final iso image;
  - allow to set the script to be used in debootstrap to check if all
    base need package are present;

debian/changelog

@@ -145,7 +145,14 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
     yaboot.conf and pegasos boot script.
   * Remove init=/linuxrc from hppa.
 
- -- Sven Luther <sven@tael.powerlinux.fr>  Wed,  6 Sep 2006 21:38:33 +0200
+  [ Otavio Salvador ]
+  * Applied patches that are being in use at O.S. Systems and that are
+    useful to others:
+    - allow to use different name for final iso image;
+    - allow to set the script to be used in debootstrap to check if all
+      base need package are present;
+
+ -- Otavio Salvador <otavio@debian.org>  Fri, 15 Sep 2006 14:56:28 -0300
 
 debian-cd (2.2.24) unstable; urgency=low
 

tools/add_debs

@@ -40,7 +40,7 @@ for DISK in $FIRSTDISKS
 do 
     DISK=${DISK##CD}
 	ok=yes
-    for p in `debootstrap --arch $ARCH --print-debs $CODENAME $TDIR/debootstrap.tmp file:$MIRROR`
+    for p in `debootstrap --arch $ARCH --print-debs $CODENAME $TDIR/debootstrap.tmp file:$MIRROR $DEBOOTSTRAP_SCRIPT`
 	do
 		if ! grep -q ^$p$ $BDIR/$DISK.packages ; then
 			if [ -n "$BASE_EXCLUDE" ] && grep -q ^$p$ $BASE_EXCLUDE ; then

tools/make_image

@@ -41,9 +41,9 @@ do
 	DISKINFO=`cat $DIR/$n.diskinfo`
 
 	if [ $ARCH = "source" ] ; then
-		OUTFILE="debian-$relname-$ARCH-$n"
+		OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$n"
 	else
-		OUTFILE="debian-$relname-$ARCH-binary-$n"
+		OUTFILE="${CDNAME:-debian}-$relname-$ARCH-binary-$n"
 	fi
 
 	# Clean up any old files