ed name of "default file" for ngircd-full package. And do the test if

the binary is executable after reading this file. [From HEAD].

diff --git a/ChangeLog b/ChangeLog
index af6436bb27932137fc78058f5c6fb6128b89c7b5..2cf968ab31fa38afc6700ff912640f33e3138aa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
 
 ngircd 0.8-CVS
 
+  - Debian: Fxied the name of the "default file" in the init script for
+    ngircd-full packages. And do the test if the binary is executable after
+    reading this file.
   - Enhanced the "test suite": please have a look at src/testsuite/README!
 
 ngircd 0.8.0 (2004-06-26)
@@ -534,4 +537,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.233.2.6 2004/09/04 20:50:53 alex Exp $
+$Id: ChangeLog,v 1.233.2.7 2004/09/06 00:36:49 alex Exp $

diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init
index 206e2f0e445e2d0c0b61331bfc69e6c32b5b7ba6..57fb056ecc8f08ffe67324eeff2839e8db927fe8 100755 (executable)
--- a/contrib/Debian/ngircd.init
+++ b/contrib/Debian/ngircd.init
@@ -2,18 +2,19 @@
 #
 # ngIRCd start and stop script for Debian-based systems
 #
-# $Id: ngircd.init,v 1.1 2003/12/31 17:20:11 alex Exp $
+# $Id: ngircd.init,v 1.1.2.1 2004/09/06 00:36:49 alex Exp $
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/ngircd
 NAME=ngIRCd
+BASENAME=`basename $0`
 DESC="IRC daemon"
 PARAMS=""
 
-test -x $DAEMON || exit 0
+test -f /etc/default/$BASENAME && . /etc/default/$BASENAME
 
-test -f /etc/default/ngircd && . /etc/default/ngircd
+test -x $DAEMON || exit 0
 
 Check_Config()
 {