diff -Nru lxc-0.8.0~rc1/debian/changelog lxc-0.8.0~rc1/debian/changelog --- lxc-0.8.0~rc1/debian/changelog 2012-08-08 23:18:51.000000000 +0000 +++ lxc-0.8.0~rc1/debian/changelog 2012-08-14 13:13:27.000000000 +0000 @@ -1,3 +1,10 @@ +lxc (0.8.0~rc1-4ubuntu24) quantal; urgency=low + + * lxc-start-ephemeral: use unionfs only for the rootfs itself + (LP: #959352) + + -- Serge Hallyn Tue, 14 Aug 2012 13:11:24 +0000 + lxc (0.8.0~rc1-4ubuntu23) quantal; urgency=low * fix FTBFS diff -Nru lxc-0.8.0~rc1/debian/local/lxc-start-ephemeral lxc-0.8.0~rc1/debian/local/lxc-start-ephemeral --- lxc-0.8.0~rc1/debian/local/lxc-start-ephemeral 2012-08-08 15:33:19.000000000 +0000 +++ lxc-0.8.0~rc1/debian/local/lxc-start-ephemeral 2012-08-14 13:10:58.000000000 +0000 @@ -147,11 +147,20 @@ sudo mount -t tmpfs none $OVERLAY_DIR LXC_DIR=`sudo mktemp -d --tmpdir=/var/lib/lxc $LXC_BASE-temp-XXXXXXX` LXC_NAME=`basename $LXC_DIR` - do_mount "/var/lib/lxc/$LXC_BASE" "${OVERLAY_DIR}" $LXC_DIR + mkdir ${LXC_DIR}/rootfs + do_mount "/var/lib/lxc/$LXC_BASE/rootfs" "${OVERLAY_DIR}" ${LXC_DIR}/rootfs EPHEMERAL_BIND_DIR=$LXC_DIR/ephemeralbind sudo mkdir $EPHEMERAL_BIND_DIR sudo mount -t tmpfs none $EPHEMERAL_BIND_DIR LXC_MOUNTED=1 + { + d1=/var/lib/lxc/${LXC_BASE} + for f in ${d1}/*; do + if [ -f $f ]; then + cp $f $LXC_DIR/ + fi + done + } # Update the ephemeral lxc's configuration to reflect the new container name. sudo sed -i -e "s/$LXC_BASE/$LXC_NAME/" $LXC_DIR/fstab $LXC_DIR/config $LXC_DIR/rootfs/etc/hostname $LXC_DIR/rootfs/etc/hosts