From b4ce9c16a7110153a3370b198ee1b196c966485f Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Thu, 9 Mar 2006 01:27:20 +0000
Subject: [PATCH] Fix to tools/grab_md5: when building the md5-list, DO NOT use
 the "current" symlink in the d-i directories - that causes jigdo problems
 later on. Use the real dirs (as dated) instead.

---
 debian/changelog |  5 +++++
 tools/grab_md5   | 29 ++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a4de64d..dadf74cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   * Consistently change location for installation guide to /doc/manual
     on the CD.
 
+  [ Steve McIntyre ]
+  * Fix to tools/grab_md5: when building the md5-list, DO NOT use the
+    "current" symlink in the d-i directories - that causes jigdo problems
+    later on. Use the real dirs (as dated) instead.
+
  -- Frans Pop <fjp@debian.org>  Thu,  9 Mar 2006 02:18:47 +0100
 
 debian-cd (2.2.24) unstable; urgency=low
diff --git a/tools/grab_md5 b/tools/grab_md5
index d7d1b457..cc6d97c5 100755
--- a/tools/grab_md5
+++ b/tools/grab_md5
@@ -69,17 +69,24 @@ case $ARCH in
                 done | sort | uniq >> $OUT
                 ;;
             *)
-                # Use the new D-I images
-                FILE=$MIRROR/dists/$SUITE/main/installer-$ARCH/current/images/MD5SUMS
-                echo "Using MD5 sums from d-i: $FILE"
-                LOC=dists/$SUITE/main/installer-$ARCH/current/images
-                for ENTRY in `cat $FILE | sed 's/  /:/g'`
-                do
-                    PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"`
-                    MD5=`echo $ENTRY | /bin/sed 's/:.*$//g'`
-                    SIZE=`/usr/bin/stat -c %s $PATH`
-                    printf '%s  %12.12s  %s\n' $MD5 $SIZE $PATH
-                done | sort | uniq >> $OUT
+
+                # Use the new D-I images. Do NOT use the "current"
+                # link; it causes problems with overlaid files...
+				for VER in $MIRROR/dists/$SUITE/main/installer-$ARCH/*
+				do
+					if [ -d $VER ] && [ ! -L $VER ] ; then
+						FILE=$VER/images/MD5SUMS
+						echo "Using MD5 sums from d-i: $FILE"
+						LOC=dists/$SUITE/main/installer-$ARCH/`basename $VER`/images
+						for ENTRY in `cat $FILE | sed 's/  /:/g'`
+						do
+							PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"`
+							MD5=`echo $ENTRY | /bin/sed 's/:.*$//g'`
+							SIZE=`/usr/bin/stat -c %s $PATH`
+							printf '%s  %12.12s  %s\n' $MD5 $SIZE $PATH
+						done | sort | uniq >> $OUT
+					fi
+				done
                 ;;
         esac
         ;;