From 34798b0761d2f45506fba0e69227377a036c6b5e Mon Sep 17 00:00:00 2001 From: Alden Date: Mon, 8 Feb 2016 14:52:03 -0800 Subject: [PATCH] In toil-box, make patch to /etc/init/docker.conf consistent with docker 1.10 --- toil/src/cgcloud/toil/toil_box.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toil/src/cgcloud/toil/toil_box.py b/toil/src/cgcloud/toil/toil_box.py index 07d751c..dd6e430 100644 --- a/toil/src/cgcloud/toil/toil_box.py +++ b/toil/src/cgcloud/toil/toil_box.py @@ -50,8 +50,8 @@ def _setup_docker( self ): @@ -1,6 +1,6 @@ description "Docker daemon" - -start on (local-filesystems and net-device-up IFACE!=lo) - +start on (local-filesystems and net-device-up IFACE!=lo and started mesosbox) + -start on (filesystem and net-device-up IFACE!=lo) + +start on (filesystem and net-device-up IFACE!=lo and started mesosbox) stop on runlevel [!2345] limit nofile 524288 1048576 limit nproc 524288 1048576""" ) )