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

Merge "Adds RHEL common element"

Browse Source
This commit is contained in:
Jenkins 2014-07-29 08:08:02 +00:00 committed by Gerrit Code Review
commit e818db25dc
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/rhel-common/README.md Normal file
View File

@ -0,0 +1 @@
This element contains the common installation steps between RHEL os releases.

6
elements/rhel/pre-install.d/00-rhsm → elements/rhel-common/pre-install.d/00-rhsm
View File

@ -44,7 +44,11 @@ if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] ; then
subscription-manager attach --pool $DIB_RHSM_POOL subscription-manager attach --pool $DIB_RHSM_POOL
fi fi
# optional repo required for diskimage-builder dependency # optional repo required for diskimage-builder dependency
repos="--enable rhel-6-server-optional-rpms" if [ "$DISTRO_NAME" == "rhel7" ]; then
repos="--enable rhel-7-server-optional-rpms"
else
repos="--enable rhel-6-server-optional-rpms"
fi
if [[ -n "$DIB_RHSM_REPOS" ]]; then if [[ -n "$DIB_RHSM_REPOS" ]]; then
for repo in $DIB_RHSM_REPOS; do for repo in $DIB_RHSM_REPOS; do
repos="$repos --enable $repo" repos="$repos --enable $repo"

0
elements/rhel/pre-install.d/10-rhel-blacklist → elements/rhel-common/pre-install.d/10-rhel-blacklist
View File

1
elements/rhel/element-deps
View File

@ -1,4 +1,5 @@
cache-url cache-url
dib-run-parts dib-run-parts
rhel-common
rpm-distro rpm-distro
yum yum

1
elements/rhel7/element-deps
View File

@ -1,6 +1,7 @@
cache-url cache-url
dib-run-parts dib-run-parts
redhat-common redhat-common
rhel-common
rpm-distro rpm-distro
source-repositories source-repositories
yum yum