sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add $EXTRA_ARGS back to yum call"

Browse Source
This commit is contained in:
Jenkins 2014-03-03 18:37:17 +00:00 committed by Gerrit Code Review
commit 27421cb257
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/yum/bin/install-packages
View File

@ -41,7 +41,7 @@ if [ -n "$WHITELIST" ]; then
if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
fi fi
yum -y install $(map-packages $WHITELIST) yum -y install $EXTRA_ARGS $(map-packages $WHITELIST)
for pkg in "$@"; do for pkg in "$@"; do
if [ "$pkg" = "python-pip" ] ; then if [ "$pkg" = "python-pip" ] ; then
alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10 alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10