Parcourir la source

[1486] Merge branch 'master' into trac1486

Stephen Morris il y a 12 ans
Parent
commit
2f15c7833b
3 fichiers modifiés avec 17 ajouts et 7 suppressions
  1. 7 0
      Makefile.am
  2. 4 2
      README
  3. 6 5
      doc/guide/bind10-guide.xml

+ 7 - 0
Makefile.am

@@ -20,6 +20,13 @@ dist_doc_DATA = AUTHORS COPYING ChangeLog README
 
 .PHONY: check-valgrind check-valgrind-suppress
 
+install-exec-hook:
+	-@echo -e "\033[1;33m" # switch to yellow color text
+	@echo "NOTE: BIND 10 does not automatically start DNS services when it is run"
+	@echo "      in its default configuration. Please see the Guide for information"
+	@echo "      on how to configure these services to be started automatically."
+	-@echo -e "\033[m" # switch back to normal
+
 check-valgrind:
 if HAVE_VALGRIND
 	@VALGRIND_COMMAND="$(VALGRIND) -q --gen-suppressions=all --track-origins=yes --num-callers=48 --leak-check=full --fullpath-after=" \

+ 4 - 2
README

@@ -58,5 +58,7 @@ For operating system specific tips see the wiki at:
 
 Please see the wiki and the doc/ directory for various documentation.
 
-The BIND 10 suite is started by running "bind10". Note that the
-default configuration does not run any DNS or DHCP servers.
+The BIND 10 suite is started by running "bind10". Note that the default
+configuration does not start any DNS or DHCP services.  Please see the
+Guide for information on how to configure these services to be started
+automatically.

+ 6 - 5
doc/guide/bind10-guide.xml

@@ -425,11 +425,12 @@ var/
         </listitem>
 
         <listitem>
-          <para>In another console, enable the authoritative DNS service
-            (by using the <command>bindctl</command> utility to configure
-            the <command>b10-auth</command> component to run):
-            <screen>$ <userinput>bindctl</userinput></screen>
-            (Login with the provided default username and password.)
+          <para>DNS and DHCP components are not started in the default
+	    configuration.  In another console, enable the authoritative
+	    DNS service (by using the <command>bindctl</command> utility
+	    to configure the <command>b10-auth</command> component to
+	    run): <screen>$ <userinput>bindctl</userinput></screen>
+	    (Login with the provided default username and password.)
             <screen>
 &gt; <userinput>config add Boss/components b10-auth</userinput>
 &gt; <userinput>config set Boss/components/b10-auth/special auth</userinput>