From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 9 Dec 2013 18:15:14 +0000 (+0100)
Subject: dsa schroot config: use {fstab,copyfiles,nssdatabases} from schroot/dsa if available
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b25b6234309fc91cbb8b1277da5a934ae78da382;p=mirror%2Fdsa-puppet.git

dsa schroot config: use {fstab,copyfiles,nssdatabases} from schroot/dsa if available
---

diff --git a/modules/porterbox/files/schroot-dsa/config b/modules/porterbox/files/schroot-dsa/config
index 86be1a935..ba94f6fed 100644
--- a/modules/porterbox/files/schroot-dsa/config
+++ b/modules/porterbox/files/schroot-dsa/config
@@ -5,13 +5,14 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-if [ -e "$/etc/schroot/default/config" ]; then
-        . "$/etc/schroot/default/config"
-else
-        FSTAB="/etc/schroot/default/fstab"
-        COPYFILES="/etc/schroot/default/copyfiles"
-        NSSDATABASES="/etc/schroot/default/nssdatabases"
-fi
+FSTAB="/etc/schroot/dsa/fstab"
+[ -e "$FSTAB" ] || FSTAB="/etc/schroot/default/fstab"
+
+COPYFILES="/etc/schroot/dsa/copyfiles"
+[ -e "$COPYFILES" ] || COPYFILES="/etc/schroot/default/copyfiles"
+
+NSSDATABASES="/etc/schroot/dsa/nssdatabases"
+[ -e "$NSSDATABASES" ] || NSSDATABASES="/etc/schroot/default/nssdatabases"
 
 
 # added by weasel: