shishi-debian changelog shishi-kdc.init.d

[Simon Josefsson]

CVSROOT:        /sources/shishi
Module name:    shishi-debian
Changes by:     Simon Josefsson <jas>   10/03/18 09:33:32

Modified files:
        .              : changelog shishi-kdc.init.d 

Log message:
        shishi-kdc.init.d: Reorder configuration file reading.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/changelog?cvsroot=shishi&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/shishi-kdc.init.d?cvsroot=shishi&r1=1.7&r2=1.8

Patches:
Index: changelog
===================================================================
RCS file: /sources/shishi/shishi-debian/changelog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- changelog   15 Mar 2010 15:53:00 -0000      1.118
+++ changelog   18 Mar 2010 09:33:32 -0000      1.119
@@ -4,8 +4,10 @@
   * Update to policy 3.8.4.
   * New upstream version.
     - New symbols added to libshishi0.symbols.
+  * shishi-kdc.init.d: Reorder configuration file reading to allow
+    override of $DAEMON.
 
- -- Simon Josefsson <address@hidden>  Mon, 15 Mar 2010 16:45:16 +0100
+ -- Simon Josefsson <address@hidden>  Thu, 18 Mar 2010 10:33:05 +0100
 
 shishi (0.0.41-1) unstable; urgency=low
 

Index: shishi-kdc.init.d
===================================================================
RCS file: /sources/shishi/shishi-debian/shishi-kdc.init.d,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- shishi-kdc.init.d   7 Oct 2009 09:41:44 -0000       1.7
+++ shishi-kdc.init.d   18 Mar 2010 09:33:32 -0000      1.8
@@ -34,12 +34,12 @@
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/shishi-kdc
 
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
 # Read configuration variable file if it is present
 [ -r /etc/default/shishi-kdc ] && . /etc/default/shishi-kdc
 
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS