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

Fix handling of parameters that are not set by any flavour for eval_run_d.

Browse Source
This commit is contained in:
Robert Collins 2012-11-12 13:45:57 +13:00
parent 40e954735c
commit 4c3c7ea9ba
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flavours/devstack/block-device-size.d/10-size
View File

@ -2,7 +2,6 @@
# Add the stack user we recommend folk use. # Add the stack user we recommend folk use.
set -e set -e
set -x
if (( '16' '>' $IMAGE_SIZE )); then if (( '16' '>' $IMAGE_SIZE )); then
echo IMAGE_SIZE=16 echo IMAGE_SIZE=16

6
lib/common-functions
View File

@ -40,6 +40,8 @@ function check_flavour () {
function eval_run_d () { function eval_run_d () {
local TEMP=`run_d $1` local TEMP=`run_d $1`
echo "$TEMP" echo "$TEMP"
TEMP=`echo "$TEMP" | grep "$2"` if [ `echo "$TEMP" | grep -s "$2"` ]; then
eval "$TEMP" TEMP=`echo "$TEMP" | grep "$2"`
eval "$TEMP"
fi
} }