josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix apt-get update, add crude caching

Browse source
This commit is contained in:
Anthony Young 2011-09-12 23:25:37 -07:00
parent 9053d6a0ea
commit e2c3a37f6c
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
build_lxc.sh
View file

@ -13,6 +13,16 @@ COPYENV=${COPYENV:-1}
lxc-stop -n $CONTAINER lxc-stop -n $CONTAINER
lxc-destroy -n $CONTAINER lxc-destroy -n $CONTAINER
FSTAB=/tmp/fstab
cat > $FSTAB <<EOF
none /var/lib/lxc/$CONTAINER/dev/pts devpts defaults 0 0
none /var/lib/lxc/$CONTAINER/proc proc defaults 0 0
none /var/lib/lxc/$CONTAINER/sys sysfs defaults 0 0
none /var/lib/lxc/$CONTAINER/var/lock tmpfs defaults 0 0
none /var/lib/lxc/$CONTAINER/var/run tmpfs defaults 0 0
/var/cache/apt/ $APTCACHEDIR none bind 0 0
EOF
# Create network configuration # Create network configuration
NET_CONF=/tmp/net.conf NET_CONF=/tmp/net.conf
cat > $NET_CONF <<EOF cat > $NET_CONF <<EOF
@ -20,6 +30,7 @@ lxc.network.type = veth
lxc.network.link = $BRIDGE lxc.network.link = $BRIDGE
lxc.network.flags = up lxc.network.flags = up
lxc.network.ipv4 = $CONTAINER_CIDR lxc.network.ipv4 = $CONTAINER_CIDR
lxc.mount = $FSTAB
EOF EOF
# Configure the network # Configure the network
@ -55,7 +66,8 @@ cat > $INSTALL_SH <<EOF
#!/bin/bash #!/bin/bash
echo "nameserver $NAMESERVER" | resolvconf -a eth0 echo "nameserver $NAMESERVER" | resolvconf -a eth0
sleep 1 sleep 1
apt-get -y --force-yes install git-core vim-nox apt-get update
apt-get -y --force-yes install git-core vim-nox sudo
git clone git://github.com/cloudbuilders/nfs-stack.git /root/nfs-stack git clone git://github.com/cloudbuilders/nfs-stack.git /root/nfs-stack
EOF EOF
@ -68,6 +80,13 @@ cat > $RC_LOCAL <<EOF
/root/install.sh /root/install.sh
EOF EOF
# Setup apt cache
# FIXME - use proper fstab mount
CWD=`pwd`
APTCACHEDIR=$CWD/cache/apt
mkdir -p $APTCACHEDIR
cp -pr $APTCACHEDIR/* $ROOTFS/var/cache/apt/
# Configure cgroup directory # Configure cgroup directory
mkdir -p /cgroup mkdir -p /cgroup
mount none -t cgroup /cgroup mount none -t cgroup /cgroup