Avoid unnecessary download of D-I images for x86 and alpha

Only do boot disk stuff for x86 and alpha if the image is supposed to be
bootable. For i386 and amd64 this avoids downloading D-I images for all
30+ CDs in a full set.

debian/changelog

@@ -7,8 +7,10 @@ debian-cd (3.1.3) UNRELEASED; urgency=low
     There are no significant changes in generated CD/DVD images.
   * Split out code for workaround for #505243 to x86-desktop function library.
   * sparc: display message for unsupported subarchitectures.
+  * Only do boot disk stuff for x86 and alpha if the image is supposed to be
+    bootable. Avoids downloading x86 D-I images for all 30+ CDs in a full set.
 
- -- Frans Pop <fjp@debian.org>  Sat, 13 Jun 2009 16:48:51 +0200
+ -- Frans Pop <fjp@debian.org>  Tue, 04 Aug 2009 21:50:26 +0200
 
 debian-cd (3.1.2) unstable; urgency=low
 

tools/boot/lenny/boot-x86

@@ -56,6 +56,9 @@ KTYPE[10]=""
 
 THISTYPE=${KTYPE[$NN]}
 
+# Exit if this is not a boot disk
+[ -n "$THISTYPE" ] || exit 0
+
 INSTALLDIR_i386="install.386"
 INSTALLDIR_amd64="install.amd"
 

tools/boot/squeeze/boot-alpha

@@ -48,6 +48,16 @@ cd $CDDIR/..
 #
 NN=`echo $N | sed -e 's/_NONUS//'`
 
+# Common options for all disks
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+
+# Only disk 1* bootable
+if [ $N != 1 -a $N != 1_NONUS ]; then
+	exit 0
+fi
+
 mkdir boot$N
 ab_deb=`ls $MIRROR/pool/main/a/aboot/aboot-base_*.deb | tail -1`
 ar p $ab_deb data.tar.gz | tar zxf - -C boot$N/ ./boot/bootlx
@@ -70,32 +80,22 @@ for image in initrd.gz vmlinuz; do
     fi
 done
 
-if [ $NN = 1 ]; then
-    echo "Using $THISTYPE boot-disks image on CD$N"
-    mkdir -p boot$N/boot
-    cp initrd.gz vmlinuz boot$N/boot/
-    mkdir -p boot$N/etc
+echo "Using $THISTYPE boot-disks image on CD$N"
+mkdir -p boot$N/boot
+cp initrd.gz vmlinuz boot$N/boot/
+mkdir -p boot$N/etc
 
-    RSIZE=$(expr $(zcat boot$N/boot/initrd.gz | wc --bytes) / 1024)
-    OPTS="ramdisk_size=$RSIZE initrd=/boot/initrd.gz root=/dev/ram devfs=mount,dall $KERNEL_PARAMS"
+RSIZE=$(expr $(zcat boot$N/boot/initrd.gz | wc --bytes) / 1024)
+OPTS="ramdisk_size=$RSIZE initrd=/boot/initrd.gz root=/dev/ram devfs=mount,dall $KERNEL_PARAMS"
 
-    echo "0:boot/vmlinuz $OPTS"               >  boot$N/etc/aboot.conf
-    echo "1:boot/vmlinuz $OPTS console=ttyS0" >> boot$N/etc/aboot.conf
-    echo "2:boot/vmlinuz $OPTS console=ttyS1" >> boot$N/etc/aboot.conf
+echo "0:boot/vmlinuz $OPTS"               >  boot$N/etc/aboot.conf
+echo "1:boot/vmlinuz $OPTS console=ttyS0" >> boot$N/etc/aboot.conf
+echo "2:boot/vmlinuz $OPTS console=ttyS1" >> boot$N/etc/aboot.conf
 
-    mkdir -p boot$N/milo
+mkdir -p boot$N/milo
 
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-alpha-boot boot/bootlx"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-alpha-boot boot/bootlx"
 
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
-
-else
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
-	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
-fi
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
 
 #install_languages $CDDIR

tools/boot/squeeze/boot-x86

@@ -56,6 +56,9 @@ KTYPE[10]=""
 
 THISTYPE=${KTYPE[$NN]}
 
+# Exit if this is not a boot disk
+[ -n "$THISTYPE" ] || exit 0
+
 INSTALLDIR_i386="install.386"
 INSTALLDIR_amd64="install.amd"