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

As far as block-device layout is concerned ppc64le == ppc64el

Browse Source 
Change-Id: I06a89f256f66eba2f73dd110f5d8a61e0f0a924c
This commit is contained in:
Tony Breeds 2017-06-26 13:13:25 +10:00
parent 7aa6a69983
commit c383428727
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diskimage_builder/lib/common-functions
View File

@ -398,7 +398,14 @@ function block_device_create_config_file {
for i in ${!image_elements[@]}; do for i in ${!image_elements[@]}; do
local cfg local cfg
# look for arch specific version first, then default # look for arch specific version first, then default
if [[ "ppc64le ppc64el" =~ $ARCH ]] ; then
# NOTE(tonyb): ppc64el and ppc64le are the same archttechture, it's
# just different distro's have different names. So if we're either
# of them pick the block-device-ppc64el.yaml file
cfg=${image_elements[$i]}/block-device-ppc64el.yaml
else
cfg=${image_elements[$i]}/block-device-${ARCH}.yaml cfg=${image_elements[$i]}/block-device-${ARCH}.yaml
fi
if [ -e ${cfg} ]; then if [ -e ${cfg} ]; then
cp ${cfg} ${config_yaml} cp ${cfg} ${config_yaml}
echo "Using block-device config: ${cfg}" echo "Using block-device config: ${cfg}"