diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-07-10 13:48:15 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-07-10 13:48:15 +1000 |
| commit | ffe3d446d5a0d3d6e6d13291aab3cd0ea3ee9bbb (patch) | |
| tree | 220c707b9dfa9ad81e34dd3b7deac0cab1e6cfef | |
| parent | 8c62e8dc28cf8bcea685e231d6b00e9156b44daa (diff) | |
allow selection of kickstart file
| -rwxr-xr-x | create_base.sh | 2 | ||||
| -rwxr-xr-x | create_node.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/create_base.sh b/create_base.sh index f0a1f42..a1a68d1 100755 --- a/create_base.sh +++ b/create_base.sh @@ -15,7 +15,7 @@ rm -rf tmp mkdir -p mnt tmp tmp/ISO echo "Creating kickstart file from template" -substitute_vars "templates/kickstart.cfg" "tmp/ks.cfg" || { +substitute_vars "$KICKSTART" "tmp/ks.cfg" || { echo "ERROR: substitution failed" exit 1 } diff --git a/create_node.sh b/create_node.sh index f7bf73c..7d1a689 100755 --- a/create_node.sh +++ b/create_node.sh @@ -48,6 +48,7 @@ echo "Creating $NAME.xml" substitute_vars templates/node.xml tmp/$NAME.xml # install the XML file -virsh undefine $NAME 2>&1 > /dev/null || true +virsh undefine $NAME > /dev/null 2>&1 || true virsh define tmp/$NAME.xml || exit 1 + exit 0 |
