From e9ed48833fee3e9232917282f0af88d39bca673e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 13:59:19 +0200
Subject: [PATCH] Using Debian terminology for images of unreleased suites.

---
 functions/releases.sh  | 4 ++--
 helpers/lh_binary_disk | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/functions/releases.sh b/functions/releases.sh
index 9f8eddf48..ad575321d 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -11,8 +11,8 @@ set -e
 
 # Debian releases
 VERSION_etch="4.0 r0"
-VERSION_lenny="prerelease"
-VERSION_sid="unreleased"
+VERSION_lenny="testing"
+VERSION_sid="unstable"
 
 # Ubuntu releases
 VERSION_hoary="5.04"
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index afd0828be..ef03ec3b4 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -59,6 +59,11 @@ DISTRIBUTION="`echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
 DISTRIBUTION="${DISTRIBUTION}`echo ${LH_DISTRIBUTION} | cut -b 2-`"
 eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
 
+if [ "${LH_DISTRIBUTION}" != "etch" ]
+then
+	ARCHITECTURE="Snapshot ${ARCHITECTURE}"
+fi
+
 case "${LH_MODE}" in
 	debian)
 		case "${LH_DEBIAN_INSTALLER}" in