Merge lp:~xnox/debian-cd/legacy-installer-arch-images into lp:~ubuntu-cdimage/debian-cd/ubun3

[Dimitri John Ledkov]

Switch from installer-arch/current/legacy-images/ to legacy-installer-arch/current/images for focal

this unbreaks virt-install

https://bugs.launchpad.net/ubuntu/+source/debian-installer/+bug/1872941

debian-cd: https://code.launchpad.net/~xnox/debian-cd/legacy-installer-arch-images/+merge/382428

debian-installer: https://code.launchpad.net/~xnox/debian-installer/legacy-installer-arch-images/+merge/382429

Switch from installer-arch/current/legacy-images/ to legacy-installer-arch/current/images for focal

this unbreaks virt-install

https://bugs.launchpad.net/ubuntu/+source/debian-installer/+bug/1872941

debian-cd: https://code.launchpad.net/~xnox/debian-cd/legacy-installer-arch-images/+merge/382428

debian-installer: https://code.launchpad.net/~xnox/debian-installer/legacy-installer-arch-images/+merge/382429

[Dimitri John Ledkov (xnox)]

Please reject, doesn't work.

review: Needs Fixing

Unmerged revisions

2055. By Dimitri John Ledkov on 2020-04-16

Switch from installer-arch/current/legacy-images/ to legacy-installer-arch/current/images for focal

=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64	2020-04-15 15:11:20 +0000
+++ tools/boot/focal/boot-amd64	2020-04-16 13:58:01 +0000
@@ -107,7 +107,7 @@
 	dir=$(dirname $image)
 	mkdir -p $dir
 	if [ ! "$DI_WWW_HOME" ];then
-		cp "$DI_PATH/current/legacy-images/$image" "$image"
+		cp "$DI_PATH/current/images/$image" "$image"
 	else
 		wget "$DI_WWW_HOME/$image" -O "$image"
 	fi

=== modified file 'tools/boot/focal/boot-arm64'
--- tools/boot/focal/boot-arm64	2020-04-15 12:15:16 +0000
+++ tools/boot/focal/boot-arm64	2020-04-16 13:58:01 +0000
@@ -84,7 +84,7 @@
 	dir=$(dirname $image)
 	mkdir -p $dir
 	if [ ! "$DI_WWW_HOME" ];then
-		cp "$DI_PATH/current/legacy-images/$image" "$image"
+		cp "$DI_PATH/current/images/$image" "$image"
 	else
 		wget "$DI_WWW_HOME/$image" -O "$image"
 	fi

=== modified file 'tools/boot/focal/boot-ppc64el'
--- tools/boot/focal/boot-ppc64el	2020-04-15 09:08:10 +0000
+++ tools/boot/focal/boot-ppc64el	2020-04-16 13:58:01 +0000
@@ -84,10 +84,10 @@
 done
 
 (cd $CDDIR/..;
- cp -a "$DI_PATH/current/legacy-images/MANIFEST.udebs" .
+ cp -a "$DI_PATH/current/images/MANIFEST.udebs" .
  list_kernel_abis $BOOT_IMAGES | check_kernel_sync)
 
-DI_DIR="$DI_PATH/current/legacy-images"
+DI_DIR="$DI_PATH/current/images"
 if [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then
 for kp in $KERNEL_PREFIXES; do
   cp -lf "$DI_DIR/${!kp}cdrom/vmlinux" "$CDDIR/install/${!kp}vmlinux"

=== modified file 'tools/boot/focal/boot-s390x'
--- tools/boot/focal/boot-s390x	2020-04-15 09:08:10 +0000
+++ tools/boot/focal/boot-s390x	2020-04-16 13:58:01 +0000
@@ -42,7 +42,7 @@
 
 imagedir="boot$N/boot"
 mkdir -p $imagedir
-DI_DIR="$DI_PATH/current/legacy-images"
+DI_DIR="$DI_PATH/current/images"
 
 cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
 sed -e 's/boot from CD-ROM or FTP-Server/default kernel/' \

=== modified file 'tools/find-newest-installer'
--- tools/find-newest-installer	2007-10-24 12:27:34 +0000
+++ tools/find-newest-installer	2020-04-16 13:58:01 +0000
@@ -22,7 +22,7 @@
 fi
 
 for try_suite in $try_suites; do
-	for try_type in installer daily-installer; do
+	for try_type in installer daily-installer legacy-installer; do
 		dir="$MIRROR/dists/$try_suite/main/$try_type-$ARCH"
 		if [ ! -h "$dir/current" ] || \
 		   ! version="$(readlink "$dir/current")"; then