From 8e58c0736fa7dba4a8d1da905c887cf603b7a653 Mon Sep 17 00:00:00 2001
From: Jiajun Liu <jiajun@unitedstack.com>
Date: Wed, 17 Jul 2013 06:41:50 +0000
Subject: [PATCH] make rejoin-stack.sh keep the same service tags

Currently rejoin-stack.sh can not keep the same screen service tags
as the first you deploy openstack due to that the stack-screenrc lack
proper command to configure screen's hardstatus. just delete the old
stack-screenrc so that function screen_rc can write proper initialize
command into stack-screenrc.

fix bug 1182597

Change-Id: I4cb4c6ded93a5c7b0bd39d65a754ddf86553463d
---
 rejoin-stack.sh | 2 +-
 stack.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rejoin-stack.sh b/rejoin-stack.sh
index 65ba7214fa..30b7bab1cc 100755
--- a/rejoin-stack.sh
+++ b/rejoin-stack.sh
@@ -17,7 +17,7 @@ if [[ -e $TOP_DIR/stack-screenrc ]]; then
         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?"
diff --git a/stack.sh b/stack.sh
index f2054d93eb..e4a7acb4e0 100755
--- a/stack.sh
+++ b/stack.sh
@@ -836,7 +836,7 @@ fi
 # 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