new file mode 100644

@@ -0,0 +1 @@

+proto

@@ -11,7 +11,7 @@ rm -rf $DEST

 # build a proto image - natty + packages that will install (optimization)

 if [ ! -d proto ]; then

     debootstrap natty proto

-    cp sources.list proto/etc/apt/sources.list

+    cp files/sources.list proto/etc/apt/sources.list

     chroot proto apt-get update

     chroot proto apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin)"`

     chroot proto pip install `cat pips/*`

@@ -33,17 +33,21 @@ echo "127.0.0.1 localhost $NAME" > $DEST/etc/hosts

 # copy kernel modules

 cp -pr /lib/modules/`uname -r` $DEST/lib/modules

+# helpful screenrc

+cp files/screenrc $DEST/root/.screenrc

+

 # copy openstack installer and requirement lists to a new directory.

 mkdir -p $DEST/opt

 cp stack.sh $DEST/opt/stack.sh

 cp -r pips $DEST/opt

 cp -r apts $DEST/opt

-# injecting root's ssh key

-# FIXME: only do this if id_rsa.pub exists

-mkdir $DEST/root/.ssh

-chmod 700 $DEST/root/.ssh

-cp /root/.ssh/id_rsa.pub $DEST/root/.ssh/authorized_keys

+# injecting root's public ssh key if it exists

+if [ -f /root/.ssh/id_rsa.pub ]; then

+    mkdir $DEST/root/.ssh

+    chmod 700 $DEST/root/.ssh

+    cp /root/.ssh/id_rsa.pub $DEST/root/.ssh/authorized_keys

+fi

 # set root password to password

 echo root:password | chroot $DEST chpasswd

new file mode 100644

@@ -0,0 +1,9 @@

+hardstatus on

+hardstatus alwayslastline

+hardstatus string "%{.bW}%-w%{.rW}%n %t%{-}%+w %=%{..G}%H %{..Y}%d/%m %c"

+

+defscrollback 1024

+

+vbell off

+startup_message off

+

new file mode 100644

@@ -0,0 +1,9 @@

+deb http://us.archive.ubuntu.com/ubuntu/ natty main restricted

+deb http://us.archive.ubuntu.com/ubuntu/ natty-updates main restricted

+deb http://us.archive.ubuntu.com/ubuntu/ natty universe

+deb http://us.archive.ubuntu.com/ubuntu/ natty-updates universe

+deb http://us.archive.ubuntu.com/ubuntu/ natty multiverse

+deb http://us.archive.ubuntu.com/ubuntu/ natty-updates multiverse

+deb http://security.ubuntu.com/ubuntu natty-security main restricted

+deb http://security.ubuntu.com/ubuntu natty-security universe

+deb http://security.ubuntu.com/ubuntu natty-security multiverse

deleted file mode 100644

@@ -1,9 +0,0 @@

-deb http://us.archive.ubuntu.com/ubuntu/ natty main restricted

-deb http://us.archive.ubuntu.com/ubuntu/ natty-updates main restricted

-deb http://us.archive.ubuntu.com/ubuntu/ natty universe

-deb http://us.archive.ubuntu.com/ubuntu/ natty-updates universe

-deb http://us.archive.ubuntu.com/ubuntu/ natty multiverse

-deb http://us.archive.ubuntu.com/ubuntu/ natty-updates multiverse

-deb http://security.ubuntu.com/ubuntu natty-security main restricted

-deb http://security.ubuntu.com/ubuntu natty-security universe

-deb http://security.ubuntu.com/ubuntu natty-security multiverse

@@ -133,18 +133,6 @@ EOF

     exit

 fi

-# Configure screen

-cat >~/.screenrc <<EOF

-hardstatus on

-hardstatus alwayslastline

-hardstatus string "%{.bW}%-w%{.rW}%n %t%{-}%+w %=%{..G}%H %{..Y}%d/%m %c"

-

-defscrollback 1024

-

-vbell off

-startup_message off

-EOF

-

 NL=`echo -ne '\015'`

 function screen_it {