Merge lp:~benji/ubuntu/precise/lxc/bug-949956 into lp:ubuntu/precise/lxc

[Benji York]

add MAC address randomization to lxc-start-ephemeral. (LP: #949956)

This branch adds the lxc-clone MAC address randomization functionality
to lxc-start-ephemeral.

The code was copied nearly verbatim, with only a slight tweak to account
for the different variable names used in lxc-start-ephemeral.

The change has been manually tested in an application that requires
starting multiple ephemeral containers based on the same original
container.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-03-08 16:03:06 +0000
@@ -0,0 +1,2 @@
+tags
+TAGS

=== modified file 'debian/local/lxc-start-ephemeral'
--- debian/local/lxc-start-ephemeral	2012-03-02 17:20:46 +0000
+++ debian/local/lxc-start-ephemeral	2012-03-08 16:03:06 +0000
@@ -125,6 +125,21 @@
 fi
 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
 
+# update the ephemeral container's MAC address (lifted from lxc-clone)
+c=$LXC_DIR/config
+# change hwaddrs
+mv ${c} ${c}.old
+(
+while read line; do
+        if [ "${line:0:18}" = "lxc.network.hwaddr" ]; then
+                echo "lxc.network.hwaddr= 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')"
+        else
+                echo $line
+        fi
+done
+) < ${c}.old > ${c}
+rm -f ${c}.old
+
 # precise is now the worst - its dhclient *uses*
 # /var/lib/dhcp3/dhclient.eth0.leases but ships without that
 # directory, so you get no leases file at all.