commit 48519da9b01cda414467cbac0209e46e76e8303c
author Jenkins <jenkins@review.openstack.org> Mon Jul 22 15:51:15 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 22 15:51:15 2013 +0000
tree 28d864e5031d00c06b03104a3869da2a7e09912d
parent 4e8d764462f978e75d9801496aca68bb45d0f30c
parent dfe3f6bae7b74683472ffc510996a1fd0c41a7c7

Merge "Set external_network_bridge for the test configuration file"

rejoin-stack.sh

diff --git a/rejoin-stack.sh b/rejoin-stack.sh
index 65ba721..30b7bab 100755
--- a/rejoin-stack.sh
+++ b/rejoin-stack.sh
@@ -17,7 +17,7 @@
         echo "Attaching to already started screen session.."
         exec screen -r stack
     fi
-    exec screen -c $TOP_DIR/stack-screenrc -S $SCREEN_NAME
+    exec screen -c $TOP_DIR/stack-screenrc
 fi
 
 echo "Couldn't find $TOP_DIR/stack-screenrc file; have you run stack.sh yet?"

stack.sh

diff --git a/stack.sh b/stack.sh
index 0a5e1ee..3fa025f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -836,7 +836,7 @@
 # Clear screen rc file
 SCREENRC=$TOP_DIR/$SCREEN_NAME-screenrc
 if [[ -e $SCREENRC ]]; then
-    echo -n > $SCREENRC
+    rm -f $SCREENRC
 fi
 
 # Initialize the directory for service status check