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

Merge "simplify ARCH param for rhel/centos param can be x86_64 and amd64"

Browse Source
This commit is contained in:
Jenkins 2016-11-15 00:44:00 +00:00 committed by Gerrit Code Review
commit be1e563524
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/centos7/root.d/10-centos7-cloud-image
View File

@ -9,10 +9,10 @@ set -o pipefail
[ -n "$ARCH" ] [ -n "$ARCH" ]
[ -n "$TARGET_ROOT" ] [ -n "$TARGET_ROOT" ]
if [ 'amd64' = "$ARCH" ] ; then if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
ARCH="x86_64" ARCH="x86_64"
else else
echo 'centos7 root element only support the amd64 $ARCH value.' echo 'centos7 root element only support the x86_64 $ARCH value.'
exit 1 exit 1
fi fi

4
elements/rhel7/root.d/10-rhel7-cloud-image
View File

@ -9,10 +9,10 @@ set -o pipefail
[ -n "$ARCH" ] [ -n "$ARCH" ]
[ -n "$TARGET_ROOT" ] [ -n "$TARGET_ROOT" ]
if [ 'amd64' = "$ARCH" ] ; then if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
ARCH="x86_64" ARCH="x86_64"
else else
echo 'rhel7 root element only support the amd64 $ARCH value.' echo 'rhel7 root element only support the x86_64 $ARCH value.'
exit 1 exit 1
fi fi

2
elements/rpm-distro/pre-install.d/01-override-yum-arch
View File

@ -9,7 +9,7 @@ set -o pipefail
if [ "i386" = "$ARCH" ]; then if [ "i386" = "$ARCH" ]; then
basearch=i386 basearch=i386
arch=i686 arch=i686
elif [ "amd64" = "$ARCH" ]; then elif [[ "amd64 x86_64" =~ "$ARCH" ]]; then
basearch=x86_64 basearch=x86_64
arch=x86_64 arch=x86_64
elif [[ "$ARCH" = "ppc64" ]]; then elif [[ "$ARCH" = "ppc64" ]]; then