From 32d1152bf719cc37f60ce867e5b0d21202851f00 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Thu, 23 Jul 2015 18:52:32 +0100
Subject: [PATCH] Backport VOLID shortening from master

---
 debian/changelog     | 1 +
 tools/start_new_disc | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4eeb26db..c7a02eb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
       files
     + Add support for debian-edu builds
     + tools/sort_deps: Improved handling of too-large packages
+    + tools/start_new_disc: shorten VOLID when possible
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/start_new_disc b/tools/start_new_disc
index 6fff29d6..9efef74f 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -36,6 +36,9 @@ if [ "$VOLID_BASE"x = ""x ] ; then
     VOLID_BASE="Debian $DEBVERSION"
 fi
 
+# Shorten the VOLID if we can - maximum length is 32 characters...
+VOLID_BASE=$(echo $VOLID_BASE | sed 's/alpha/a/gi;s/beta/b/gi;')
+
 if [ "$DISKINFO_DISTRO"x = ""x ] ; then
     DISKINFO_DISTRO="Debian"
 fi