iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etiona fixes, new bash-trace
[automated-distro-installer]
/
fai-revm
diff --git
a/fai-revm
b/fai-revm
index a44b218c994df855a90377181a18544515a58a3a..9fa0787ae335624adc238a4df2f4d726193a4506 100755
(executable)
--- a/
fai-revm
+++ b/
fai-revm
@@
-87,7
+87,7
@@
is_arch_revm() {
[[ ${0##*/} == arch-revm ]]
}
[[ ${0##*/} == arch-revm ]]
}
-err
catch
-cleanup() {
+err-cleanup() {
echo "doing cleanup"
e ./pxe-server $dhcp_arg
./faiserver-disable
echo "doing cleanup"
e ./pxe-server $dhcp_arg
./faiserver-disable
@@
-170,7
+170,7
@@
sleep 30
while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
e sleep 5
done
while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
e sleep 5
done
-unset err
catch
-cleanup
+unset err-cleanup
e ./pxe-server $dhcp_arg
if is_arch_revm; then
./arch-init-remote $name
e ./pxe-server $dhcp_arg
if is_arch_revm; then
./arch-init-remote $name