From 331f983593a527f04046c2d6131847adcdf95e3e Mon Sep 17 00:00:00 2001
From: Greg Thornton <xdissent@me.com>
Date: Mon, 26 Aug 2013 09:43:49 -0500
Subject: [PATCH 1/2] Start docker after lxc-net to prevent ip forwarding race

---
 packaging/ubuntu/docker.upstart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/ubuntu/docker.upstart b/packaging/ubuntu/docker.upstart
index 143be03402..2370cb5553 100644
--- a/packaging/ubuntu/docker.upstart
+++ b/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

From 3f141e1fd3a11507b049359ea59253b49395d494 Mon Sep 17 00:00:00 2001
From: Greg Thornton <xdissent@me.com>
Date: Thu, 29 Aug 2013 14:06:24 -0500
Subject: [PATCH 2/2] Update remaining upstart scripts to wait for lxc-net

---
 contrib/install.sh   | 2 +-
 hack/release/make.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/install.sh b/contrib/install.sh
index 3cf7169a07..40e3aaafb4 100755
--- a/contrib/install.sh
+++ b/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
diff --git a/hack/release/make.sh b/hack/release/make.sh
index 7792297861..d68e4c0487 100755
--- a/hack/release/make.sh
+++ b/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