From: Christoph Egger Date: Sun, 1 Nov 2015 12:47:15 +0000 (+0100) Subject: shorten chroot name for kFreeBSD X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=822520fce3695a84be4fed8511f4c127737c8f41;p=mirror%2Fdsa-puppet.git shorten chroot name for kFreeBSD Signed-off-by: Christoph Egger Signed-off-by: Aurelien Jarno --- diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot index d015c030e..c1350cdbf 100755 --- a/modules/schroot/files/setup-dchroot +++ b/modules/schroot/files/setup-dchroot @@ -77,6 +77,7 @@ genschrootconf() { local arch="$1"; shift local target="$1"; shift local extra="${1:-}"; shift || true + local aliases="" if [ -n "$extra" ]; then local suite="${suite}-${extra}" @@ -88,6 +89,15 @@ genschrootconf() { local name="${suite}_${arch}-dchroot" fi + case "$arch" in + kfreebsd-*) + aliases="$name" + # FreeBSD only allows relatively short paths to mountpoints + # therefore saving a few charakters making the chroot dir fit + name=${name/kfreebsd-amd64/k-a} + name=${name/kfreebsd-i386/k-i} + ;; + esac cat << EOF [${name}] @@ -103,7 +113,14 @@ EOF echo "profile=$personality" if [ "$THISARCH" = "$arch" ] && [ -z "$buildd" ]; then - echo "aliases=$suite" + if [ -z "$aliases" ] ; then + aliases="$suite" + else + aliases="$aliases,$suite" + fi + fi + if [ -n "$aliases" ] ; then + echo "aliases=$aliases" fi case "$arch" in armel|armhf|i386|mips|mipsel|powerpc|s390|sparc)