Strip "images/cdrom" suffix from mirror DI_DIR path in boot-alpha

debian/changelog

@@ -19,6 +19,7 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium
   * Fix relative d-i path for kernel images and initrd in boot-sparc64.
   * Add support for unreleased debian-installer packages from Debian Ports.
   * Fix relative d-i path for kernel images and initrd in boot-alpha.
+  * Strip "images/cdrom" suffix from mirror DI_DIR path in boot-alpha.
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 19 Jun 2017 13:59:36 +0100
 

tools/boot/buster/boot-alpha

@@ -72,7 +72,7 @@ for image in initrd.gz vmlinuz; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
 		if [ ! "$DI_DIR" ];then
-		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current"
 		fi
 		ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1`
 		cp "$ab_file" .

tools/boot/jessie/boot-alpha

@@ -65,7 +65,7 @@ for image in initrd.gz vmlinuz; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
 		if [ ! "$DI_DIR" ];then
-		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current"
 		fi
 		ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1`
 		cp "$ab_file" .

tools/boot/stretch/boot-alpha

@@ -72,7 +72,7 @@ for image in initrd.gz vmlinuz; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
 		if [ ! "$DI_DIR" ];then
-		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current"
 		fi
 		ab_file=`ls "$DI_DIR"/cdrom/$image* | tail -1`
 		cp "$ab_file" .