Merge pull request #1570 from jerrykan/master

Add $DOCKER_OPTS to early-docker.service ExecStart
This commit is contained in:
Michael Marineau 2015-10-12 12:05:36 -07:00
commit da98ca4ce9

View File

@ -9,7 +9,7 @@ Environment=TMPDIR=/var/tmp
MountFlags=slave
LimitNOFILE=1048576
LimitNPROC=1048576
ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid
ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS
[Install]
WantedBy=early-docker.target