added a notice to init script when /etc/named.conf doesn't exist (#216075)

2 files changed, 6 insertions, 3 deletions

diff --git a/bind.spec b/bind.spec
index 8b34c67..4212703 100644
--- a/bind.spec
+++ b/bind.spec
@@ -450,7 +450,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.146 2006/11/22 14:07:26 stransky Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.147 2006/12/06 10:24:21 stransky Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -784,6 +784,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - renamed package, it should meet the N-V-R criteria
 - fix for #216185: bind-chroot-admin able to change root mode 750
 - added fix from #215997: incorrect permissions on dnszone.schema
+- added a notice to init script when /etc/named.conf doesn't exist (#216075)
 
 * Mon Oct 30 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-6
 - fix for #200465: named-checkzone and co. cannot be run as non-root user
diff --git a/named.init b/named.init
index c479b9c..990df06 100755
--- a/named.init
+++ b/named.init
@@ -60,7 +60,9 @@ if [ ! -r ${ROOTDIR}${named_conf} ] ; then
        named_conf='/etc/named.caching-nameserver.conf';
        OPTIONS="$OPTIONS -c ${named_conf}";
    else
-       echo Locating $ROOTDIR/${named_conf} failed:
+       echo Locating $ROOTDIR/${named_conf} failed.
+       echo $"I can't find any configuration file. Please create it by system-config-bind"
+       echo $"or install caching-nameserver."
        failure
        echo;
        exit 1;
@@ -204,7 +206,7 @@ stop() {
          	   if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
 		   	killproc $named -TERM >/dev/null 2>&1
 	           	RETVAL=$?
-			echo -n $"no response, killing with -TERM "
+			echo $"no response, killing with -TERM "
 			break
         	   else
 			sleep 2 && echo -n "."