From b30e35c601cfa83395cac76f4c51cb573feeb506 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 26 Nov 2009 17:11:36 +0100
Subject: [PATCH] Enable batch mode for devel/upload
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.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
devel/upload.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/devel/upload.in b/devel/upload.in
index 6c1986223..8f31c3bcb 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/" \
root@${host}:/ &
done
@@ -109,7 +111,7 @@ wait
if test -z "${NO_RESTART}"; then
for host; do
echo Restarting ganeti-noded on ${host}...
- ssh root@${host} /etc/init.d/ganeti restart &
+ ssh -oBatchMode=yes root@${host} /etc/init.d/ganeti restart &
done
wait
fi
--
GitLab