From 16341967b11499ae2ea1ed70c6524e6e628083a5 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Mon, 31 Oct 2011 00:21:56 -0700 Subject: [PATCH] don't show the grep in build_libvirt.sh --- tools/build_libvirt.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/build_libvirt.sh b/tools/build_libvirt.sh index f24f726..b9cd4c3 100755 --- a/tools/build_libvirt.sh +++ b/tools/build_libvirt.sh @@ -406,7 +406,7 @@ if [ "$WAIT_TILL_LAUNCH" = "1" ]; then sleep 1 done - tail -n +1 -F $VM_DIR/console.log & + tail -F $VM_DIR/console.log & TAIL_PID=$! @@ -418,11 +418,15 @@ if [ "$WAIT_TILL_LAUNCH" = "1" ]; then # Let Ctrl-c kill tail and exit trap kill_tail SIGINT + set +o xtrace + echo "Waiting stack.sh to finish..." while ! cat $VM_DIR/console.log | grep -q 'All done' ; do - sleep 5 + sleep 1 done + set -o xtrace + kill $TAIL_PID if grep -q "stack.sh failed" $VM_DIR/console.log; then