From: Peter Palfrader Date: Wed, 6 May 2015 06:09:25 +0000 (+0200) Subject: Use -kfreebsd suite name on jessie/kfreebsd X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=37182cf8f36563bebe19ab80e7bd320612fd8bde;p=mirror%2Fdsa-puppet.git Use -kfreebsd suite name on jessie/kfreebsd --- diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot index ab76466a6..78e3f2f59 100755 --- a/modules/schroot/files/setup-dchroot +++ b/modules/schroot/files/setup-dchroot @@ -274,6 +274,17 @@ target="$basedir/$tuple.tar.gz" schrootconfig="/etc/schroot/chroot.d/${tuple}-$suffix" ! [ -e "$schrootconfig" ] || [ -n "$force" ] || die "Error: $schrootconfig already exists." +suite_alias="$suite" +case "$arch" in + kfreebsd-*) + case "$suite" in + jessie) + suite_alias="$suite-kfreebsd" + ;; + esac + ;; +esac + # # let's go @@ -302,7 +313,7 @@ debootstrap \ --include="apt" \ --variant=buildd \ --arch="$arch" \ - "$suite" "$rootdir" "$mirror" "$script" + "$suite_alias" "$rootdir" "$mirror" "$script" echo "$tuple" > "$rootdir/etc/debian_chroot" echo "force-unsafe-io" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-unsafe-io" echo "force-confnew" > "$rootdir/etc/dpkg/dpkg.cfg.d/force-confnew"