commit 037d3bdea4a2ce2ca8c5475e6c3367093c70aa15
author Jesse Andrews <anotherjesse@gmail.com> Tue Nov 01 17:34:35 2011 -0700
committer Jesse Andrews <anotherjesse@gmail.com> Tue Nov 01 17:34:35 2011 -0700
tree 9cc7d9b780ec3d07a0da117a1d74840a4e434c8b
parent 34cc802b509df8e4a346c4472a4aa006d616ef7a
parent 55c027372326380c3f29ed4dcd6a0b498c52a4dd

Merge pull request #143 from cloudbuilders/fix_races

Fix NBD race conditions

.gitignore

diff --git a/.gitignore b/.gitignore
index 22a7898..e482090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 proto
 *~
+*.log
+src
 localrc

tools/xen/build_domU.sh

diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index 7ca6155..8e40225 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -331,13 +331,13 @@
     trap kill_tail SIGINT
 
     echo "Waiting stack.sh to finish..."
-    while ! ssh -q stack@$PUB_IP "grep -q 'stack.sh completed in' run.sh.log" ; do
+    while ! ssh -q stack@$PUB_IP "grep -q 'stack.sh completed in' run.sh.log"; do
         sleep 1
     done
 
     kill $TAIL_PID
 
-    if ! ssh -q stack@$PUB_IP "grep -q 'stack.sh failed' run.sh.log" ; then
+    if ssh -q stack@$PUB_IP "grep -q 'stack.sh failed' run.sh.log"; then
         exit 1
     fi
     echo ""