Browse code
XenAPI: Fix new useage of trueorfalse
* Ensure that Xen setup scripts will continue to function when unset
variables are used in stackrc
* Ensure that the generic functions are sourced in all places that xenrc
(which sources stackrc) is sourced.
Change-Id: I54eba20733c2e149621b74a1387f0bef14fca12e
Bob Ball authored on 2014/02/02 18:16:20Showing 3 changed files
| ... | ... |
@@ -21,9 +21,19 @@ set -o xtrace |
| 21 | 21 |
# This directory |
| 22 | 22 |
TOP_DIR=$(cd $(dirname "$0") && pwd) |
| 23 | 23 |
|
| 24 |
+# Source lower level functions |
|
| 25 |
+. $TOP_DIR/../../functions |
|
| 26 |
+ |
|
| 24 | 27 |
# Include onexit commands |
| 25 | 28 |
. $TOP_DIR/scripts/on_exit.sh |
| 26 | 29 |
|
| 30 |
+# xapi functions |
|
| 31 |
+. $TOP_DIR/functions |
|
| 32 |
+ |
|
| 33 |
+# Determine what system we are running on. |
|
| 34 |
+# Might not be XenServer if we're using xenserver-core |
|
| 35 |
+GetDistro |
|
| 36 |
+ |
|
| 27 | 37 |
# Source params - override xenrc params in your localrc to suite your taste |
| 28 | 38 |
source xenrc |
| 29 | 39 |
|
| ... | ... |
@@ -22,9 +22,19 @@ set -o xtrace |
| 22 | 22 |
# This directory |
| 23 | 23 |
TOP_DIR=$(cd $(dirname "$0") && pwd) |
| 24 | 24 |
|
| 25 |
+# Source lower level functions |
|
| 26 |
+. $TOP_DIR/../../functions |
|
| 27 |
+ |
|
| 25 | 28 |
# Include onexit commands |
| 26 | 29 |
. $TOP_DIR/scripts/on_exit.sh |
| 27 | 30 |
|
| 31 |
+# xapi functions |
|
| 32 |
+. $TOP_DIR/functions |
|
| 33 |
+ |
|
| 34 |
+# Determine what system we are running on. |
|
| 35 |
+# Might not be XenServer if we're using xenserver-core |
|
| 36 |
+GetDistro |
|
| 37 |
+ |
|
| 28 | 38 |
# Source params - override xenrc params in your localrc to suite your taste |
| 29 | 39 |
source xenrc |
| 30 | 40 |
|