- dictd.conf is autogenerated before start

Changed files:
    dictd.init -> 1.2

diff --git a/dictd.init b/dictd.init
index 39aace176fb6e2470b7f74ba370d32cad7c4d937..13dff9de1318d4e1b655942094df24f1faf17a4f 100644 (file)
--- a/dictd.init
+++ b/dictd.init
@@ -8,14 +8,26 @@
 #               a client to access dictionary definitions from a set of \
 #              natural language dictionary databases.
 # processname: dictd
-# config:      /etc/dictd.conf
+# config:      /etc/dictd.conf 
+# config:       /etc/dictd/*
 
 DAEMON_FILE=dictd
 DAEMON_NAME="Dictionary Daemon"  
+DAEMON_CONF=/etc/dictd.conf
 
-# Sanity checks.
-[ -f /etc/${DAEMON_FILE}.conf ] || exit 0
-[ -x /usr/sbin/${DAEMON_FILE} ] || exit 0
+generate_dictdconf() {
+    umask 022
+    if ls /etc/dictd/*.dictconf >/dev/null 2>&1; then 
+       echo "# DO NOT EDIT! This file is autogenerated by $0." >$DAEMON_CONF
+       echo "# To configure dictd edit /etc/dictd/* files and restart daemon"\
+          >>$DAEMON_CONF
+       cat /etc/dictd/dictd-main.conf /etc/dictd/*.dictconf >>$DAEMON_CONF
+       return 0
+    fi 
+
+    echo "$0: no dictionaries found"
+    return 1   
+}
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -35,12 +47,17 @@ RETVAL=0
 # See how we were called.
 case "$1" in
     start)
+       [ -x /usr/sbin/${DAEMON_FILE} ] || exit 0
        if [ ! -f /var/lock/subsys/${DAEMON_FILE} ]; then
-               msg_starting ${DAEMON_NAME}
-               daemon ${DAEMON_FILE} ${DICTD_OPTS}
-               pidofproc ${DAEMON_FILE} >/dev/null 2>&1
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${DAEMON_FILE}
+               if generate_dictdconf; then 
+                   msg_starting ${DAEMON_NAME}
+                   daemon ${DAEMON_FILE} ${DICTD_OPTS}
+                   pidofproc ${DAEMON_FILE} >/dev/null 2>&1
+                   RETVAL=$?
+                   [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${DAEMON_FILE}
+               else  
+                   exit 1
+               fi    
        else
                msg_Already_Running ${DAEMON_NAME}
                exit 1