diff options
author | Thomas F Herbert <therbert@redhat.com> | 2018-03-11 19:01:09 -0400 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-04-04 14:38:50 +0000 |
commit | fc11dba19e92609e0631c567ac25756f0c3697df (patch) | |
tree | e7943ca95e68c34c9efdd57ae28e092b15c9b206 /resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh | |
parent | fc7a9563a6d23aaaace589606e431fad409b1ab9 (diff) |
Update to Centos image 7.4-1711
Add qemu-ev version 2.9.0-16
Changes required for vpp 18.04:
Add selinux policy rpms at required version.
Add mbedtls
JIRA: CSIT-566
JIRA: CSIT-680
JIRA: CSIT-681
JIRA: CSIT-602
JIRA: CSIT-608
JIRA: CSIT-603
Update Centos image version 1.8:
Point to Vault repo specific to for 7.3-1611 for
consistent control of package versions and releases.
Fix for pypcap import problem.
JIRA: CSIT-991
This fix forces the downloads of the complete package for all the pip python
packages to be installed on Centos regardless of the Python metadata on
the host.
Change-Id: Id651dd113eec41db738ac1e10c92d1074e89b1de
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
Diffstat (limited to 'resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh')
-rw-r--r-- | resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh b/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh index bd45d2330c..fdaeebd58c 100644 --- a/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh +++ b/resources/tools/disk-image-builder/centos/scripts-remote/post-install.sh @@ -32,17 +32,19 @@ echo =======================End Remove NetworkManager=========================== ### echo "********** INSTALLING RPMs **********" -# We're doing this the hard way as we're dealing with a bunch of -# rpm packages without using yum. +# If it exists, copy in a specific Centos Repo for the Centos version for this image . # Attempt up to five cycles of unpack/configure. There may be dependency # problems during the first one(s). -echo ==========================yum update============================== -yum clean all -yum install -y deltarpm -yum update -y -yum install -y @base epel-release -echo ==========================end yum update============================== +echo ==========================yum repos============================== +if [ -f ${TEMP_PATH}/rpm/Centos-Vault.repo ] ; then + echo ==========================Install specific yum repo====================== + sed -i '/gpgcheck=1/s/.*/&\nenabled=0/' /etc/yum.repos.d/CentOS-Base.repo + cp -f ${TEMP_PATH}/rpm/Centos-Vault.repo /etc/yum.repos.d +else + echo ==========================Update from base repo and updates================ + : ; +fi attempt=1 MAX_ATTEMPTS=3 try_again=1 @@ -55,7 +57,7 @@ do do # use rpm command if url is present in the package file if [ ! -z $url ] ; then - rpm -i $url$name || try_again=1 + rpm -i $url$name.rpm || try_again=1 else yum install -y $name || try_again=1 fi |