From e139f887e18db02af9d83eca0ed3f38811ce3d94 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 26 Apr 2015 09:54:25 +0200 Subject: [PATCH] use the schroot-unpack tmpfs when available --- modules/schroot/files/setup-dchroot | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot index 6169920bc..ab76466a6 100755 --- a/modules/schroot/files/setup-dchroot +++ b/modules/schroot/files/setup-dchroot @@ -254,7 +254,17 @@ fi suite="$1"; shift tuple="${suite}_${arch}" -builddir=${builddir:-$basedir} +if [ -z "${builddir:-}" ]; then + builddir=${builddir:-$basedir} + for u in schroot-unpack unpack; do + # if one of these directories exists and is on a different filesystem, prefer it. + candidate="$builddir/$u" + if [ -e "$candidate" ] && + [ "$(stat -f --printf '%i\n' "$builddir" )" != "$(stat -f --printf '%i\n' "$candidate")" ]; then + builddir="$candidate" + fi + done +fi [ -d "$basedir" ] || die "Error: $basedir does not exist (or is not a directory)." [ -d "$builddir" ] || die "Error: $builddir does not exist (or is not a directory)." -- 2.20.1