X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fschroot-setup.d%2F99porterbox-extra-sources;h=c5a1a20b637156a63b39d90402c117b3ed62c246;hb=d3004dc1b483d63efa50fecf94b94226f4d3e14f;hp=854296a8f202d7b98dd24fa59736de7948342fd5;hpb=76deaa566a96bb2cfe42f74236bc4642971863b9;p=mirror%2Fdsa-puppet.git diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources index 854296a8f..c5a1a20b6 100755 --- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources +++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources @@ -12,10 +12,12 @@ set -e . "$SETUP_DATA_DIR/common-data" . "$SETUP_DATA_DIR/common-functions" -if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then +if [ -f "${CHROOT_SCRIPT_CONFIG:-}" ]; then . "$CHROOT_SCRIPT_CONFIG" -elif [ "$STATUS" = "ok" ]; then - fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist" +elif [ -f "$CHROOT_PROFILE_DIR/config" ]; then + . "$CHROOT_PROFILE_DIR/config" +else + fatal "Cannot find config script" fi