give sensible values for the volume label and use it for .iso filename

diff --git a/live/auto/build b/live/auto/build
index 03015cf57b55787953b5a9ecfc7d73aa9c3e0fd8..df0f4fb39d13aa8d4b52c7a2f3785560c7dbafb8 100755 (executable)
--- a/live/auto/build
+++ b/live/auto/build
@@ -1,2 +1,11 @@
 #!/bin/sh
+
 lb build noauto ${@} 2>&1 | tee binary.log
+
+iso=binary-hybrid.iso
+release_name=$(isoinfo -d -i "${iso}" \
+       | sed -n -e '/Volume id:/s,.*: *,,gp' \
+       | sed -e 's, [Ll]ive,-live,g' \
+       | tr 'A-Z ' 'a-z_' \
+       | sed -e 's,[()],,g')
+mv binary-hybrid.iso "${release_name}.iso"

diff --git a/live/auto/config b/live/auto/config
index 6f842809f2e316ccc385174533762996ba143f8a..30bcc3be92963ebbbfc8fc43c758171243e75d7f 100755 (executable)
--- a/live/auto/config
+++ b/live/auto/config
@@ -5,6 +5,7 @@ set -eu
 # the Debian release to use as a basis for the live-cd
 nd_basedist="squeeze"
 nd_version="6.0.0"
+nd_arch=i386
 
 deb_mirror="http://debproxy:9999"
 
@@ -21,7 +22,7 @@ fi
 lb config noauto \
   --apt apt \
   --apt-recommends true \
-  --architecture i386 \
+  --architecture ${nd_arch} \
   --archive-areas "main contrib non-free" \
   --binary-images iso-hybrid \
   --binary-indices none \
@@ -30,8 +31,9 @@ lb config noauto \
   --distribution ${nd_basedist} \
   --hostname neurodebian \
   --iso-application "NeuroDebian Live" \
-  --iso-preparer "NeuroDebian v.{nd_version}; http://neuro.debian.net" \
+  --iso-preparer "NeuroDebian ${nd_version}; http://neuro.debian.net" \
   --iso-publisher "NeuroDebian project; http://neuro.debian.net" \
+  --iso-volume "NeuroDebian Live ${nd_version} ($nd_arch)" \
   --keyring-packages "debian-archive-keyring neurodebian-keyring" \
   --memtest memtest86+ \
   --mirror-bootstrap "${deb_mirror}/debian/" \