docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity

Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic

Browse Source 
Fix sysvinit upstart detection and give it a pretty message
Upstream-commit: 5fe4c9a39a50f46842504234dd487a4c6c5d2d1e
Component: engine
This commit is contained in:
Tianon Gravi
2013-11-11 10:39:51 -08:00
parent 4a3b02d57d 60cd8ebc40
commit 62719e2bfe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/contrib/init/sysvinit/docker
View File

@@ -29,7 +29,8 @@ if [ -f /etc/default/$BASE ]; then
. /etc/default/$BASE
fi
if [ "$1" = start ] && which initctl >/dev/null && initctl version | grep -q upstart; then
if which initctl >/dev/null && initctl version | grep -q upstart; then
log_failure_msg "Docker is managed via upstart, try using service $BASE $1"
exit 1
fi