Browse code

simplifications - remove CLEAN option, remove unneccesary lxc code

Anthony Young authored on 2011/09/14 02:13:23
Showing 2 changed files
... ...
@@ -64,12 +64,6 @@ echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers
64 64
 
65 65
 # Copy over your ssh keys and env if desired
66 66
 if [ "$COPYENV" = "1" ]; then
67
-    cp -pr ~/.ssh $ROOTFS/root/.ssh
68
-    cp -p ~/.ssh/id_rsa.pub $ROOTFS/root/.ssh/authorized_keys
69
-    cp -pr ~/.gitconfig $ROOTFS/root/.gitconfig
70
-    cp -pr ~/.vimrc $ROOTFS/root/.vimrc
71
-    cp -pr ~/.bashrc $ROOTFS/root/.bashrc
72
-
73 67
     cp -pr ~/.ssh $ROOTFS/opt/.ssh
74 68
     cp -p ~/.ssh/id_rsa.pub $ROOTFS/opt/.ssh/authorized_keys
75 69
     cp -pr ~/.gitconfig $ROOTFS/opt/.gitconfig
... ...
@@ -125,12 +119,3 @@ mount none -t cgroup /cgroup
125 125
 
126 126
 # Start our container
127 127
 lxc-start -d -n $CONTAINER
128
-
129
-cat << EOF > /bin/remove_dead_cgroup.shecho
130
-"Removing dead cgroup .$CONTAINER." >> /var/log/cgroup
131
-rmdir /cgroup/$CONTAINER >> /var/log/cgroup 2>&1
132
-echo "return value was $?" >> /var/log/cgroup
133
-EOF
134
-chmod 755 /bin/remove_dead_cgroup.sh
135
-echo /bin/remove_dead_cgroup.sh > /cgroup/release_agent
136
-echo 1 > /cgroup/notify_on_release
... ...
@@ -26,13 +26,6 @@ set -o xtrace
26 26
 DIR=`pwd`
27 27
 DEST=/opt
28 28
 
29
-# Provide option to move aside any old code
30
-if [ "$CLEAN" = "1"]; then
31
-    TMPDIR=/tmp/stackbak_`date +%s`
32
-    mkdir $TMPDIR
33
-    mv $DEST/* $TMPDIR
34
-fi
35
-
36 29
 # Set the destination directories for openstack projects
37 30
 NOVA_DIR=$DEST/nova
38 31
 DASH_DIR=$DEST/dash