Module: ngircd.git Branch: master Commit: e2f09213bcef479e7b3a35d67b1cc6b76f2205fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e2f09213b... Author: Alexander Barton <alex@barton.de> Date: Mon Aug 19 23:31:10 2013 +0200 Debian init script: test for binary after reading defaults This allows the system administrator to overwrite the DAEMON variable in /etc/defaults/<name> and to use this init script even when the default "/usr/sbin/ngircd" doesn't exist on the system. --- contrib/Debian/ngircd.default | 2 -- contrib/Debian/ngircd.init | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/Debian/ngircd.default b/contrib/Debian/ngircd.default index 5b6c93f..add278f 100644 --- a/contrib/Debian/ngircd.default +++ b/contrib/Debian/ngircd.default @@ -1,8 +1,6 @@ # # Defaults for ngIRCd start and stop script # -# $Id: ngircd.default,v 1.1 2003/12/31 17:20:11 alex Exp $ -# # Parameters to pass to the ngircd daemon on startup, see ngircd(8) for # possible options (default: empty). diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index 6a418d7..8639e22 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd start and stop script for Debian-based systems -# Copyright 2008-2010 Alexander Barton <alex@barton.de> +# Copyright 2008-2013 Alexander Barton <alex@barton.de> # ### BEGIN INIT INFO @@ -24,13 +24,13 @@ PARAMS="" STARTTIME=1 DIETIME=10 -test -x $DAEMON || exit 5 - test -h "$0" && me=`readlink $0` || me="$0" BASENAME=`basename $me` test -r /etc/default/$BASENAME && . /etc/default/$BASENAME +test -x $DAEMON || exit 5 + # LSB compatibility functions that become used if there is no local # include file available. log_daemon_msg() {