From 64e22ecd9ab38afaaaa81e7cd9f1c901dfe03b9b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Jan 2007 22:43:03 +0000 Subject: [PATCH] debian init scripts: print a nice warning when not starting avahi due to settings in /etc/default git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1369 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- initscript/debian/avahi-daemon.in | 11 +++++++++++ initscript/debian/avahi-dnsconfd.in | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in index 553db78..30a2c2f 100755 --- a/initscript/debian/avahi-daemon.in +++ b/initscript/debian/avahi-daemon.in @@ -75,6 +75,16 @@ else return $1 } + log_warning_msg () { + if log_use_fancy_output; then + YELLOW=`$TPUT setaf 3` + NORMAL=`$TPUT op` + echo "$YELLOW*$NORMAL $@" + else + echo "$@" + fi + } + fi #set -e @@ -93,6 +103,7 @@ AVAHI_DAEMON_START=1 test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon if [ "$AVAHI_DAEMON_START" != "1" -a "$1" != "stop" ]; then + log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME" exit 0 fi diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in index ee63e06..ac34804 100755 --- a/initscript/debian/avahi-dnsconfd.in +++ b/initscript/debian/avahi-dnsconfd.in @@ -75,6 +75,16 @@ else return $1 } + log_warning_msg () { + if log_use_fancy_output; then + YELLOW=`$TPUT setaf 3` + NORMAL=`$TPUT op` + echo "$YELLOW*$NORMAL $@" + else + echo "$@" + fi + } + fi #set -e @@ -93,6 +103,7 @@ AVAHI_DNSCONFD_START=1 test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then + log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME" exit 0 fi -- 2.7.4