From d056a7b6e56d3e5352432f41993e32fc59eb7bbf Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Tue, 28 Feb 2006 01:23:18 +0000
Subject: [PATCH] Mipsel boot images haven't actually moved yet in etch. Cope
 with this - fall back to the old location if the new one isn't there.

---
 debian/changelog            | 4 ++++
 tools/boot/etch/boot-mipsel | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5036fb8a..3a591177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -186,6 +186,10 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   * Added icon to powerpc/chrp bootinfo.txt, which will allow booting on IBM
     RS6K and pSeries. Closes: #352672
 
+  [ Steve McIntyre ]
+  * Mipsel boot images haven't actually moved yet in etch. Cope with this
+    - fall back to the old location if the new one isn't there.
+
  -- Frans Pop <fjp@debian.org>  Wed, 15 Feb 2006 23:18:19 +0100
 
 debian-cd (2.2.23) unstable; urgency=low
diff --git a/tools/boot/etch/boot-mipsel b/tools/boot/etch/boot-mipsel
index 5e4fa175..d3fb172a 100755
--- a/tools/boot/etch/boot-mipsel
+++ b/tools/boot/etch/boot-mipsel
@@ -52,6 +52,9 @@ install -m 644 -D "$DELOROOT"/boot/delo.2nd "$CDROOT"/boot/delo.2nd
 if [ ! "$DI_WWW_HOME" ];then
 	if [ ! "$DI_DIR" ];then
 	   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/decstation/cdrom/"
+       if [ ! -e $DI_DIR ] ; then
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/"
+       fi
 	fi
 else
         DI_DIR="."