X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fschroot-dsa%2Fconfig;h=86be1a93577bb37355dea3866a50cef2d7e73064;hb=6c1ddb4d3292d02659f13442e82a89a63ab006ae;hp=c94c6b3640e52d54a17fb5c11574fe1cc76232f0;hpb=435ec83a093bb9bb6638d8b46a6c8ab8cd13a231;p=mirror%2Fdsa-puppet.git diff --git a/modules/porterbox/files/schroot-dsa/config b/modules/porterbox/files/schroot-dsa/config index c94c6b364..86be1a935 100644 --- a/modules/porterbox/files/schroot-dsa/config +++ b/modules/porterbox/files/schroot-dsa/config @@ -5,20 +5,27 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -. "/etc/schroot/default/config" +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 + # added by weasel: if [ "$CHROOT_SESSION_PURGE" = "true" ]; then case $CHROOT_DESCRIPTION in "["*-*_*-dchroot"]"*) - chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#[}"; chroot_type="${chroot_type%%]*}" + chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}" suitevariant_arch_tuple="${chroot_type%%-dchroot-*}" suitevariant=${suitevariant_arch_tuple%_*} SUITE_BASE=${suitevariant%-*} SUITE_VARIANT=${suitevariant##*-} ;; "["*_*-dchroot"]"*) - chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#[}"; chroot_type="${chroot_type%%]*}" + chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}" SUITE_BASE="${chroot_type%%_*}" ;; *)