summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 13:59:19 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commit10f7ee3fbea10618910eee0da7e62b0652e25279 (patch)
tree75c88b1ca2e1624e2b9644ce767cca77511f34bf
parent9ca38ca4ef0e1dcd01d9656f2c5361159f481665 (diff)
downloadlive-build-10f7ee3fbea10618910eee0da7e62b0652e25279.zip
live-build-10f7ee3fbea10618910eee0da7e62b0652e25279.tar.gz
Using Debian terminology for images of unreleased suites.
-rwxr-xr-xfunctions/releases.sh4
-rwxr-xr-xhelpers/lh_binary_disk5
2 files changed, 7 insertions, 2 deletions
diff --git a/functions/releases.sh b/functions/releases.sh
index 9f8eddf..ad57532 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 afd0828..ef03ec3 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