From 9c261ef9386c22b9fbfcac1778b2d32de7600a39 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 13 Sep 2011 10:13:23 -0700
Subject: [PATCH] simplifications - remove CLEAN option, remove unneccesary lxc
 code

---
 build_lxc.sh | 15 ---------------
 stack.sh     |  7 -------
 2 files changed, 22 deletions(-)

diff --git a/build_lxc.sh b/build_lxc.sh
index 5e07b1a..1f33a33 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -64,12 +64,6 @@ echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers
 
 # Copy over your ssh keys and env if desired
 if [ "$COPYENV" = "1" ]; then
-    cp -pr ~/.ssh $ROOTFS/root/.ssh
-    cp -p ~/.ssh/id_rsa.pub $ROOTFS/root/.ssh/authorized_keys
-    cp -pr ~/.gitconfig $ROOTFS/root/.gitconfig
-    cp -pr ~/.vimrc $ROOTFS/root/.vimrc
-    cp -pr ~/.bashrc $ROOTFS/root/.bashrc
-
     cp -pr ~/.ssh $ROOTFS/opt/.ssh
     cp -p ~/.ssh/id_rsa.pub $ROOTFS/opt/.ssh/authorized_keys
     cp -pr ~/.gitconfig $ROOTFS/opt/.gitconfig
@@ -125,12 +119,3 @@ mount none -t cgroup /cgroup
 
 # Start our container
 lxc-start -d -n $CONTAINER
-
-cat << EOF > /bin/remove_dead_cgroup.shecho
-"Removing dead cgroup .$CONTAINER." >> /var/log/cgroup
-rmdir /cgroup/$CONTAINER >> /var/log/cgroup 2>&1
-echo "return value was $?" >> /var/log/cgroup
-EOF
-chmod 755 /bin/remove_dead_cgroup.sh
-echo /bin/remove_dead_cgroup.sh > /cgroup/release_agent
-echo 1 > /cgroup/notify_on_release
diff --git a/stack.sh b/stack.sh
index 0fe84ad..c72a3af 100755
--- a/stack.sh
+++ b/stack.sh
@@ -26,13 +26,6 @@ set -o xtrace
 DIR=`pwd`
 DEST=/opt
 
-# Provide option to move aside any old code
-if [ "$CLEAN" = "1"]; then
-    TMPDIR=/tmp/stackbak_`date +%s`
-    mkdir $TMPDIR
-    mv $DEST/* $TMPDIR
-fi
-
 # Set the destination directories for openstack projects
 NOVA_DIR=$DEST/nova
 DASH_DIR=$DEST/dash