From e9369a660df12ef23534bcc7429656e21d93139f Mon Sep 17 00:00:00 2001 From: Greg Thornton Date: Mon, 26 Aug 2013 09:43:49 -0500 Subject: [PATCH 1/2] Start docker after lxc-net to prevent ip forwarding race Upstream-commit: 331f983593a527f04046c2d6131847adcdf95e3e Component: engine --- components/engine/packaging/ubuntu/docker.upstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/packaging/ubuntu/docker.upstart b/components/engine/packaging/ubuntu/docker.upstart index 143be03402..2370cb5553 100644 --- a/components/engine/packaging/ubuntu/docker.upstart +++ b/components/engine/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 6f14a61b9c37ccc00418d0ad9ad17c43a65be23d Mon Sep 17 00:00:00 2001 From: Greg Thornton Date: Thu, 29 Aug 2013 14:06:24 -0500 Subject: [PATCH 2/2] Update remaining upstart scripts to wait for lxc-net Upstream-commit: 3f141e1fd3a11507b049359ea59253b49395d494 Component: engine --- components/engine/contrib/install.sh | 2 +- components/engine/hack/release/make.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/contrib/install.sh b/components/engine/contrib/install.sh index 3cf7169a07..40e3aaafb4 100755 --- a/components/engine/contrib/install.sh +++ b/components/engine/contrib/install.sh @@ -47,7 +47,7 @@ else echo "Creating /etc/init/dockerd.conf..." cat >/etc/init/dockerd.conf <