From d9eafd58913453b70b2664c272ac3063ae14280c Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sat, 10 Dec 2011 13:55:44 -0800
Subject: [PATCH] move back to nova.sh method of configuring screen

instead of overwriting screenrc (which is useful for new VMs), we manually set
the screen status line - fixes bug 902297

Change-Id: I507dc36e85e2bc3635503cde426bab8a2e966f06
---
 files/screenrc | 9 ---------
 stack.sh       | 6 ++----
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 files/screenrc

diff --git a/files/screenrc b/files/screenrc
deleted file mode 100644
index e18db39d80..0000000000
--- a/files/screenrc
+++ /dev/null
@@ -1,9 +0,0 @@
-hardstatus on
-hardstatus alwayslastline
-hardstatus string "%{.bW}%-w%{.rW}%n %t%{-}%+w %=%{..G}%H %{..Y}%d/%m %c"
-
-defscrollback 10240
-
-vbell off
-startup_message off
-
diff --git a/stack.sh b/stack.sh
index 9d991f2155..6cf5f4a0f7 100755
--- a/stack.sh
+++ b/stack.sh
@@ -569,10 +569,6 @@ if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
     cd $QUANTUM_DIR; sudo python setup.py develop
 fi
 
-# Add a useful screenrc.  This isn't required to run openstack but is we do
-# it since we are going to run the services in screen for simple
-cp $FILES/screenrc ~/.screenrc
-
 # Syslog
 # ---------
 
@@ -1122,6 +1118,8 @@ function screen_it {
 # create a new named screen to run processes in
 screen -d -m -S stack -t stack
 sleep 1
+# set a reasonable statusbar
+screen -r stack -X hardstatus alwayslastline "%-Lw%{= BW}%50>%n%f* %t%{-}%+Lw%< %= %H"
 
 # launch the glance registry service
 if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then