Merge pull request #1673 from xdissent/1659-upstart-order

Start docker after lxc-net to prevent ip forwarding race

contrib/install.sh

@@ -47,7 +47,7 @@ else
   echo "Creating /etc/init/dockerd.conf..."
   cat >/etc/init/dockerd.conf <<EOF
 description "Docker daemon"
-start on filesystem or runlevel [2345]
+start on filesystem and started lxc-net
 stop on runlevel [!2345]
 respawn
 exec /usr/local/bin/docker -d

hack/release/make.sh

@@ -52,7 +52,7 @@ private PaaS, service-oriented architectures, etc."
 
 UPSTART_SCRIPT='description     "Docker daemon"
 
-start on filesystem or runlevel [2345]
+start on filesystem and started lxc-net
 stop on runlevel [!2345]
 
 respawn

packaging/ubuntu/docker.upstart

@@ -1,6 +1,6 @@
 description     "Run docker"
 
-start on filesystem or runlevel [2345]
+start on filesystem and started lxc-net
 stop on runlevel [!2345]
 
 respawn