diff options
| author | Christian Berendt <berendt@b1-systems.de> | 2015-07-17 11:58:09 +0200 |
|---|---|---|
| committer | Christian Berendt <christian@berendt.io> | 2015-07-17 10:14:19 +0000 |
| commit | 57093e8dfe3d28d4f7109c4c1a6ba8f85aa77ecd (patch) | |
| tree | 7834645d8dbb56f359c7a01ba130c5f954a800f0 | |
| parent | 51b7915ae8094fe149ff1752be01d6ff29fed15e (diff) | |
| download | kolla-57093e8dfe3d28d4f7109c4c1a6ba8f85aa77ecd.tar.gz kolla-57093e8dfe3d28d4f7109c4c1a6ba8f85aa77ecd.zip | |
Only use default values for MY_IP/MY_DEV in genenv if not set
This way it is possible to manually specify MY_IP/MY_DEV when running
the genenv script.
Closes-bug: #1475572
Change-Id: I291815a4ed1ea15adbddf94905706c77c8bb5a09
| -rwxr-xr-x | tools/genenv | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/genenv b/tools/genenv index 95082ee54..5878a23ae 100755 --- a/tools/genenv +++ b/tools/genenv @@ -30,11 +30,11 @@ check_binarydependencies REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") cd "$(dirname "$REAL_PATH")/.." -MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') | - awk '$4 == "src" {print $5}') +MY_IP=${MY_IP:-$(ip route get $(ip route | awk '$1 == "default" {print $3}') | + awk '$4 == "src" {print $5}')} -MY_DEV=$(ip route get $(ip route | awk '$1 == "default" {print $3}') | - awk '$4 == "src" {print $3}') +MY_DEV=${MY_DEV:-$(ip route get $(ip route | awk '$1 == "default" {print $3}') | + awk '$4 == "src" {print $3}')} echo MY_IP=$MY_IP echo MY_DEV=$MY_DEV |