* Dump the mkisofs command-line used for each CD into .disk/mkisofs

as we make it. Closes: #258099

debian/changelog

@@ -81,6 +81,8 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
     the installer to use.
   * Add bpalogin near the top of the task list, as requested a long time
     ago. Closes: #231583
+  * Dump the mkisofs command-line used for each CD into .disk/mkisofs
+    as we make it. Closes: #258099
 
  -- Frans Pop <fjp@debian.org>  Thu, 23 Nov 2006 01:42:00 +0100
 

tools/make_image

@@ -57,13 +57,14 @@ do
 	case $DOJIGDO in
 	
 		0) # No jigdo files, just straight ISO
-			echo $MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.iso $opts $dirs CD$n
+			echo $MKISOFS $MKISOFS_OPTS -V \'"$volid"\' -o $OUT/$OUTFILE.iso $opts $dirs CD$n
+			echo $MKISOFS $MKISOFS_OPTS -V \'"$volid"\' -o $OUT/$OUTFILE.iso $opts $dirs CD$n > CD$n/.disk/mkisofs
 			$MKISOFS $MKISOFS_OPTS -V "$volid" -o $OUT/$OUTFILE.iso $opts $dirs CD$n
 			;;
 
 
 		1) # jigdo files _and_ ISO
-			echo $MKISOFS $MKISOFS_OPTS -V "$volid" \
+			echo $MKISOFS $MKISOFS_OPTS -V \'"$volid"\' \
 				-o $OUT/$OUTFILE.iso \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
 				-jigdo-template $OUT/$OUTFILE.template \
@@ -71,6 +72,14 @@ do
 				-jigdo-exclude boot$n \
 				-md5-list $DIR/md5-check \
 				$JIGDO_OPTS $opts $dirs CD$n
+			echo $MKISOFS $MKISOFS_OPTS -V \'"$volid"\' \
+				-o $OUT/$OUTFILE.iso \
+				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
+				-jigdo-template $OUT/$OUTFILE.template \
+				-jigdo-map Debian=$MIRROR/ \
+				-jigdo-exclude boot$n \
+				-md5-list $DIR/md5-check \
+				$JIGDO_OPTS $opts $dirs CD$n > CD$n/.disk/mkisofs
 			$MKISOFS $MKISOFS_OPTS -V "$volid" \
 				-o $OUT/$OUTFILE.iso \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
@@ -82,7 +91,7 @@ do
 			;;
 
 		2) # jigdo only, no ISO
-			echo $MKISOFS $MKISOFS_OPTS -V "$volid" \
+			echo $MKISOFS $MKISOFS_OPTS -V \'"$volid"\' \
 				-o /dev/null \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
 				-jigdo-template $OUT/$OUTFILE.template \
@@ -90,6 +99,14 @@ do
 				-jigdo-exclude boot$n \
 				-md5-list $DIR/md5-check \
 				$JIGDO_OPTS $opts $dirs CD$n
+			echo $MKISOFS $MKISOFS_OPTS -V \'"$volid"\' \
+				-o /dev/null \
+				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
+				-jigdo-template $OUT/$OUTFILE.template \
+				-jigdo-map Debian=$MIRROR/ \
+				-jigdo-exclude boot$n \
+				-md5-list $DIR/md5-check \
+				$JIGDO_OPTS $opts $dirs CD$n > CD$n/.disk/mkisofs
 			$MKISOFS $MKISOFS_OPTS -V "$volid" \
 				-o /dev/null \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \