From 927a656ac2835610349af64e251af9d2bc85c489 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 14 Sep 2011 01:58:01 -0700
Subject: [PATCH] more work on multi-lxc

---
 build_lxc.sh | 5 ++++-
 stack.sh     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build_lxc.sh b/build_lxc.sh
index 9f133fd..4987193 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -120,13 +120,16 @@ cat > $RUN_SH <<EOF
 echo "nameserver $NAMESERVER" | resolvconf -a eth0
 sleep 1
 
+# Kill any existing screens
+sudo -c "killall screen" stack
+
 # Install and run stack.sh
 apt-get update
 apt-get -y --force-yes install git-core vim-nox sudo
 if [ ! -d "/opt/nfs-stack" ]; then
     su -c "git clone git://github.com/cloudbuilders/nfs-stack.git ~/nfs-stack" stack
 fi
-nohup su -c "cd ~/nfs-stack && $STACKSH_PARAMS ./stack.sh" stack &> /opt/run.sh.log
+su -c "cd ~/nfs-stack && $STACKSH_PARAMS ./stack.sh" stack &> /opt/run.sh.log
 EOF
 
 # Make the run.sh executable
diff --git a/stack.sh b/stack.sh
index 62f813a..88e779c 100755
--- a/stack.sh
+++ b/stack.sh
@@ -37,7 +37,7 @@ API_DIR=$DEST/openstackx
 NOVNC_DIR=$DEST/noVNC
 
 # Specify which services to launch.  These generally correspond to screen tabs
-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash
+ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash}
 
 # Use the first IP unless an explicit is set by ``HOST_IP`` environment variable
 if [ ! -n "$HOST_IP" ]; then