simplifications - remove CLEAN option, remove unneccesary lxc code

This commit is contained in:
Anthony Young 2011-09-13 10:13:23 -07:00
parent 1003952b16
commit 9c261ef938
2 changed files with 0 additions and 22 deletions

View file

@ -64,12 +64,6 @@ echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers
# Copy over your ssh keys and env if desired # Copy over your ssh keys and env if desired
if [ "$COPYENV" = "1" ]; then 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 -pr ~/.ssh $ROOTFS/opt/.ssh
cp -p ~/.ssh/id_rsa.pub $ROOTFS/opt/.ssh/authorized_keys cp -p ~/.ssh/id_rsa.pub $ROOTFS/opt/.ssh/authorized_keys
cp -pr ~/.gitconfig $ROOTFS/opt/.gitconfig cp -pr ~/.gitconfig $ROOTFS/opt/.gitconfig
@ -125,12 +119,3 @@ mount none -t cgroup /cgroup
# Start our container # Start our container
lxc-start -d -n $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

View file

@ -26,13 +26,6 @@ set -o xtrace
DIR=`pwd` DIR=`pwd`
DEST=/opt 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 # Set the destination directories for openstack projects
NOVA_DIR=$DEST/nova NOVA_DIR=$DEST/nova
DASH_DIR=$DEST/dash DASH_DIR=$DEST/dash