X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fdisk-image-builder%2Fcentos%2Fbuild.sh;h=0276df8d4f97f129c039d3db69e4de686f86940d;hp=c01d8f634e38ca79f7eb25a9fd45154948b69ea6;hb=fc11dba19e92609e0631c567ac25756f0c3697df;hpb=fc7a9563a6d23aaaace589606e431fad409b1ab9 diff --git a/resources/tools/disk-image-builder/centos/build.sh b/resources/tools/disk-image-builder/centos/build.sh index c01d8f634e..0276df8d4f 100755 --- a/resources/tools/disk-image-builder/centos/build.sh +++ b/resources/tools/disk-image-builder/centos/build.sh @@ -83,7 +83,7 @@ PACKER_DIR="${BUILD_DIR}/packer" RPM_CACHE_DIR="${BUILD_DIR}/cache/rpm" PIP_CACHE_DIR="${BUILD_DIR}/cache/pip" -PACKER_TEMPLATE="centos-7.3-1611.json" +PACKER_TEMPLATE="$1.json" LISTS_DIR="$(dirname $0)/lists" function syntax { @@ -196,11 +196,17 @@ mkdir -p ${OUTPUT_DIR}/temp/rpm mkdir -p ${RPM_CACHE_DIR} RPM_FILE="${LIST}/rpm-packages.txt" +REPO_FILE="${LIST}/Centos-Vault.repo" ### ### Copy rpm package list to cache dir because we are going to use yum on the image ### echo cp $RPM_FILE ${RPM_CACHE_DIR} cp $RPM_FILE ${RPM_CACHE_DIR} +if [ -e $REPO_FILE ] ; then + echo cp $REPO_FILE ${RPM_CACHE_DIR} + cp $REPO_FILE ${RPM_CACHE_DIR} + ln ${RPM_CACHE_DIR}/Centos-Vault.repo ${OUTPUT_DIR}/temp/rpm/Centos-Vault.repo +fi ln ${RPM_CACHE_DIR}/rpm-packages.txt ${OUTPUT_DIR}/temp/rpm/rpm-packages.txt ## PIP