* Stop using the silly .raw extension for output images, use .iso instead

* Improve support for different disk types. Specify DISKTYPE in CONF.sh,
    and it will affect both the output name later (so it's now possible to
    distinguish between CDs and DVDs). Defaults to CD if not otherwise
    set. DISKTYPE will be used more in the future for sizing too, but that
    merge can wait a while longer yet. Closes: #361422
  * Use DISKTYPE and COMPLETE values to create the file .disk/cd_type for
    the installer to use.

CONF.sh

@@ -178,6 +178,13 @@ ATTEMPT_FALLBACK=yes
 export DEFBINSIZE=630
 export DEFSRCSIZE=635
 
+# Set the disk type, used later in various places. Soon this will also
+# be used to work out the disk size automatically
+if [ "$DISKTYPE"x = ""x ] ; then
+    DISKTYPE=CD
+fi
+export DISKTYPE
+
 # We don't want certain packages to take up space on CD1...
 #export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME
 # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x)

Makefile

@@ -26,17 +26,17 @@ ifndef CAPCODENAME
 CAPCODENAME:=$(shell perl -e "print ucfirst("$(CODENAME)")")
 endif
 ifndef BINDISKINFO
-export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num $(BUILD_DATE)"
+export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) $(ARCH) Binary-$$num $(BUILD_DATE)"
 endif
 ifndef SRCDISKINFO
-export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num $(BUILD_DATE)"
+export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) Source-$$num $(BUILD_DATE)"
 endif
 # ND=No-Date versions for README
 ifndef BINDISKINFOND
-export BINDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num"
+export BINDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) $(ARCH) Binary-$$num"
 endif
 ifndef SRCDISKINFOND
-export SRCDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num"
+export SRCDISKINFOND="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(DISKTYPE) Source-$$num"
 endif
 ifndef BINVOLID
 ifeq ($(ARCH),powerpc)

debian/CONF.sh

@@ -178,6 +178,13 @@ ATTEMPT_FALLBACK=yes
 export DEFBINSIZE=630
 export DEFSRCSIZE=635
 
+# Set the disk type, used later in various places. Soon this will also
+# be used to work out the disk size automatically
+if [ "$DISKTYPE"x = ""x ] ; then
+    DISKTYPE=CD
+fi
+export DISKTYPE
+
 # We don't want certain packages to take up space on CD1...
 #export EXCLUDE="$BASEDIR"/tasks/exclude-$CODENAME
 # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x)

debian/changelog

@@ -71,6 +71,14 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
     for the boot-$arch scripts to use rather than simply appending to the
     $N.mkisofs_opts file directly. Needed for forthcoming multi-arch
     support.
+  * Stop using the silly .raw extension for output images, use .iso instead
+  * Improve support for different disk types. Specify DISKTYPE in CONF.sh,
+    and it will affect both the output name later (so it's now possible to
+    distinguish between CDs and DVDs). Defaults to CD if not otherwise
+    set. DISKTYPE will be used more in the future for sizing too, but that
+    merge can wait a while longer yet. Closes: #361422
+  * Use DISKTYPE and COMPLETE values to create the file .disk/cd_type for
+    the installer to use.
 
  -- Frans Pop <fjp@debian.org>  Thu, 23 Nov 2006 01:42:00 +0100
 

tools/add_debs

@@ -66,6 +66,16 @@ do
         echo 'local' >> $BDIR/CD$DISK/.disk/base_components
     fi
 
+    if [ $COMPLETE = 1 ]; then
+        if [ $DISKTYPE = DVD ]; then
+            echo "dvd" > .disk/cd_type
+        else
+            echo "full_cd" > .disk/cd_type
+        fi
+    else
+        echo "not_complete" > .disk/cd_type
+    fi
+
 	# Sort out the udeb include and exclude files
     if [ -n "$UDEB_INCLUDE" ] ; then
 		if [ -r "$UDEB_INCLUDE" ] ; then

tools/make_image

@@ -42,13 +42,13 @@ do
 	DISKINFO=`cat $DIR/$n.diskinfo`
 
 	if [ $ARCH = "source" ] ; then
-		OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$n"
+		OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$DISKTYPE-$n"
 	else
-		OUTFILE="${CDNAME:-debian}-$relname-$ARCH-binary-$n"
+		OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$DISKTYPE-binary-$n"
 	fi
 
 	# Clean up any old files
-	rm -f $OUT/$OUTFILE.raw $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template
+	rm -f $OUT/$OUTFILE.iso $OUT/$OUTFILE.jigdo $OUT/$OUTFILE.template
 
 	date
 
@@ -57,14 +57,14 @@ do
 	case $DOJIGDO in
 	
 		0) # No jigdo files, just straight ISO
-			echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts $dirs CD$n
-			$MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.raw $opts $dirs CD$n
+			echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.iso $opts $dirs CD$n
+			$MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.iso $opts $dirs CD$n
 			;;
 
 
 		1) # jigdo files _and_ ISO
 			echo $MKISOFS $MKISOFS_OPTS -V "$volid" \
-				-o $OUT/$OUTFILE.raw \
+				-o $OUT/$OUTFILE.iso \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
 				-jigdo-template $OUT/$OUTFILE.template \
 				-jigdo-map Debian=$MIRROR/ \
@@ -72,7 +72,7 @@ do
 				-md5-list $DIR/md5-check \
 				$JIGDO_OPTS $opts $dirs CD$n
 			$MKISOFS $MKISOFS_OPTS -V "$volid" \
-				-o $OUT/$OUTFILE.raw \
+				-o $OUT/$OUTFILE.iso \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
 				-jigdo-template $OUT/$OUTFILE.template \
 				-jigdo-map Debian=$MIRROR/ \