diff options
| author | Lu Chong <Chong.Lu@windriver.com> | 2013-11-07 12:40:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:31:35 +0000 |
| commit | bd53283b599ae57a50e1966089222f3b9a81db12 (patch) | |
| tree | 6a9a03c53ec381c254b886dffea2b6bc880cb7b7 /meta/recipes-connectivity/avahi | |
| parent | 44121975a65a0382c61aecf99495177c21fc244a (diff) | |
| download | ast2050-yocto-poky-bd53283b599ae57a50e1966089222f3b9a81db12.zip ast2050-yocto-poky-bd53283b599ae57a50e1966089222f3b9a81db12.tar.gz | |
avahi: fix avahi status command error prompt
service --status-all command will display wrong status for avahi-daemon.
This commit fix this error prompt and make service display right status
for avahi-daemon.
(From OE-Core rev: a0525f3da109848e4b1989247b07fac411b270ce)
Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch | 52 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index cf063db..00622f3 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -25,6 +25,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://avahi_fix_install_issue.patch \ file://fix_for_automake_1.12.x.patch \ file://out-of-tree.patch \ + file://0001-avahi-fix-avahi-status-command-error-prompt.patch \ " USERADD_PACKAGES = "avahi-daemon avahi-autoipd" diff --git a/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch b/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch new file mode 100644 index 0000000..7590df7 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch @@ -0,0 +1,52 @@ +From f774ac25f436a782ccccc4dbe68378a684596799 Mon Sep 17 00:00:00 2001 +From: Lu Chong <Chong.Lu@windriver.com> +Date: Thu, 7 Nov 2013 14:36:28 +0800 +Subject: [PATCH] avahi: fix avahi status command error prompt + +service --status-all command will display wrong status for avahi-daemon. +This commit fix this error prompt and make service display right status +for avahi-daemon. + +Upstream-Status: Pending + +Signed-off-by: Lu Chong <Chong.Lu@windriver.com> +--- + initscript/debian/avahi-daemon.in | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in +index 4793b46..49ec358 100755 +--- a/initscript/debian/avahi-daemon.in ++++ b/initscript/debian/avahi-daemon.in +@@ -153,7 +153,15 @@ d_reload() { + # Function that check the status of the daemon/service. + # + d_status() { +- $DAEMON -c && echo "$DESC is running" || echo "$DESC is not running" ++ $DAEMON -c ++ status=$? ++ if [ $status = 0 ]; then ++ echo "$DESC is running" ++ return 0 ++ else ++ echo "$DESC is not running" ++ return 3 ++ fi + } + + case "$1" in +@@ -182,9 +190,9 @@ case "$1" in + d_status + ;; + *) +- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 ++ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload|status}" >&2 + exit 1 + ;; + esac + +-exit 0 ++exit $? +-- +1.7.9.5 + |
