Since the rsync/ssh calls are done in parallel, they can't read properly a
password or confirmation about keys from stdin. As such, it's better to enable
batch mode so that they fail right away instead of prompting and then timing
out after a long while.
---
devel/upload.in | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/devel/upload.in b/devel/upload.in
index 6c19862..8f31c3b 100644
--- a/devel/upload.in
+++ b/devel/upload.in
@@ -100,7 +100,9 @@ echo ---
# and now put it under $prefix on the target node(s)
for host; do
echo Uploading code to ${host}...
- rsync -v -rlDc --exclude="*.py[oc]" --exclude="*.pdf" --exclude="*.html" \
+ rsync -v -rlDc \
+ -e "ssh -oBatchMode=yes" \
+ --exclude="*.py[oc]" --exclude="*.pdf" --exclude="*.html" \
"$TXD/" \
r...@${host}:/ &
done
@@ -109,7 +111,7 @@ wait
if test -z "${NO_RESTART}"; then
for host; do
echo Restarting ganeti-noded on ${host}...
- ssh r...@${host} /etc/init.d/ganeti restart &
+ ssh -oBatchMode=yes r...@${host} /etc/init.d/ganeti restart &
done
wait
fi
--
1.6.5.3