Backport VOLID shortening from master
This commit is contained in:
parent
4bc7234624
commit
32d1152bf7
|
@ -8,6 +8,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
|
||||||
files
|
files
|
||||||
+ Add support for debian-edu builds
|
+ Add support for debian-edu builds
|
||||||
+ tools/sort_deps: Improved handling of too-large packages
|
+ 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
|
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,9 @@ if [ "$VOLID_BASE"x = ""x ] ; then
|
||||||
VOLID_BASE="Debian $DEBVERSION"
|
VOLID_BASE="Debian $DEBVERSION"
|
||||||
fi
|
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
|
if [ "$DISKINFO_DISTRO"x = ""x ] ; then
|
||||||
DISKINFO_DISTRO="Debian"
|
DISKINFO_DISTRO="Debian"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue