From 022112d019d1a1c5b781a8e9ce34e9f472f20e6d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 7 Jan 2015 10:52:08 +0100 Subject: [PATCH] Support having version-specific lxc-config as conf/${DISTRIBUTION}-${RELEASE} if present, this is used, otherwise conf/${DISTRIBUTION} as before. --- common/package.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/package.sh b/common/package.sh index 943915e..16cf4c5 100755 --- a/common/package.sh +++ b/common/package.sh @@ -23,7 +23,11 @@ popd &>>${LOG} # Prepare package contents log 'Preparing box package contents' -cp conf/${DISTRIBUTION} ${WORKING_DIR}/lxc-config +if [ -f conf/${DISTRIBUTION}-${RELEASE} ]; then + cp conf/${DISTRIBUTION}-${RELEASE} ${WORKING_DIR}/lxc-config +else + cp conf/${DISTRIBUTION} ${WORKING_DIR}/lxc-config +fi cp conf/metadata.json ${WORKING_DIR} sed -i "s//${NOW}/" ${WORKING_DIR}/metadata.json