From 88edba7e86efc8d7e118a9863ab701f0b5493d62 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 11 Nov 2013 11:57:25 -0700 Subject: [PATCH] Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly) --- contrib/init/sysvinit/docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/init/sysvinit/docker b/contrib/init/sysvinit/docker index 3dc643553..2d79c4d4c 100755 --- a/contrib/init/sysvinit/docker +++ b/contrib/init/sysvinit/docker @@ -29,7 +29,8 @@ if [ -f /etc/default/$BASE ]; then . /etc/default/$BASE fi -if which initctl >/dev/null && initctl version | grep -q upstart; then +# see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it) +if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | /bin/grep -q upstart; then log_failure_msg "Docker is managed via upstart, try using service $BASE $1" exit 1 fi