0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix sysvinit upstart detection and give it a pretty message
This commit is contained in:
Tianon Gravi 2013-11-11 10:39:51 -08:00
commit 5fe4c9a39a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
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