Browse Source

[1901] Fix run script, add manpage, revert ChangeLog

According to the first part of the review in http://bind10.isc.org/ticket/1901#comment:11
Jelte Jansen 12 years ago
parent
commit
10d6323616

+ 11 - 11
ChangeLog

@@ -575,7 +575,7 @@ bind10-devel-20121115 released on November 15, 2012
 
 487.	[bug]		jinmei
 	The bind10 process now terminates a component (subprocess) by the
-	"config remove Init/components" bindctl command even if the
+	"config remove Boss/components" bindctl command even if the
 	process crashes immediately before the command is sent to bind10.
 	Previously this led to an inconsistent state between the
 	configuration and an internal component list of bind10, and bind10
@@ -599,7 +599,7 @@ bind10-devel-20121115 released on November 15, 2012
 	completion added a part twice has been solved, and it no longer
 	suggests the confusing value 'argument' as a completion-hint for
 	configuration items. Additionally, bindctl no longer crashes upon
-	input like 'config remove Init'.
+	input like 'config remove Boss'.
 	(Trac #2254, git 9047de5e8f973e12e536f7180738e6b515439448)
 
 484.	[func]		tomek
@@ -1462,7 +1462,7 @@ bind10-devel-20120119 released on January 19, 2012
 	the -u flag for switching the user after initialization.
 	Note: this change broke backward compatibility to boss component
 	configuration.  If your b10-config.db contains "setuid" for
-	Init.components, you'll need to remove that entry by hand before
+	Boss.components, you'll need to remove that entry by hand before
 	starting BIND 10.
 	(Trac #1508, #1509, #1510,
 	git edc5b3c12eb45437361484c843794416ad86bb00)
@@ -1785,7 +1785,7 @@ bind10-devel-20111128 released on November 28, 2011
 316.	[func]*		vorner
 	The configuration of what parts of the system run is more
 	flexible now.  Everything that should run must have an
-	entry in Init/components.
+	entry in Boss/components.
 	(Trac #213, git 08e1873a3593b4fa06754654d22d99771aa388a6)
 
 315.	[func]		tomek
@@ -1856,9 +1856,9 @@ bind10-devel-20111128 released on November 28, 2011
 	(Trac #1279, git cd3588c9020d0310f949bfd053c4d3a4bd84ef88)
 
 306.	[bug]		stephen
-	Init process now waits for the configuration manager to initialize
+	Boss process now waits for the configuration manager to initialize
 	itself before continuing with startup.  This fixes a race condition
-	whereby the Init could start the configuration manager and then
+	whereby the Boss could start the configuration manager and then
 	immediately start components that depended on that component being
 	fully initialized.
 	(Trac #1271, git 607cbae949553adac7e2a684fa25bda804658f61)
@@ -2521,7 +2521,7 @@ bind10-devel-20110322 released on March 22, 2011
 
 206.	[func]		shane
 	Add the ability to list the running BIND 10 processes using the
-	command channel. To try this, use "Init show_processes".
+	command channel. To try this, use "Boss show_processes".
 	(Trac #648, git 451bbb67c2b5d544db2f7deca4315165245d2b3b)
 
 205.	[bug]		jinmei
@@ -2685,7 +2685,7 @@ bind10-devel-20110224 released on February 24, 2011
 179.	[func]		vorner
 	It is possible to start and stop resolver and authoritative
 	server without restart of the whole system. Change of the
-	configuration (Init/start_auth and Init/start_resolver) is
+	configuration (Boss/start_auth and Boss/start_resolver) is
 	enough.
 	(Trac #565, git 0ac0b4602fa30852b0d86cc3c0b4730deb1a58fe)
 
@@ -2751,7 +2751,7 @@ bind10-devel-20110224 released on February 24, 2011
 	(Trac #449, git 8aa3b2246ae095bbe7f855fd11656ae3bdb98986)
 
 168.	[bug]		vorner
-	Init no longer has the -f argument, which was undocumented and
+	Boss no longer has the -f argument, which was undocumented and
 	stayed as a relict of previous versions, currently causing only
 	strange behaviour.
 	(Trac #572, git 17f237478961005707d649a661cc72a4a0d612d4)
@@ -3062,7 +3062,7 @@ bind10-devel-20101201 released on December 01, 2010
 	Output changed to JSON format for consistency. (svn r3694)
 
 122.	[func]		stephen
-	src/bin/bind10: Added configuration options to Init to determine
+	src/bin/bind10: Added configuration options to Boss to determine
 	whether to start the authoritative server, recursive server (or
 	both). A dummy program has been provided for test purposes.
 	(Trac #412, svn r3676)
@@ -3131,7 +3131,7 @@ bind10-devel-20101201 released on December 01, 2010
 
 111.	[bug]*		Vaner
 	Make sure process xfrin/xfrout/zonemgr/cmdctl can be stopped
-	properly when user enter "ctrl+c" or 'Init shutdown' command
+	properly when user enter "ctrl+c" or 'Boss shutdown' command
 	through bindctl.  The ZonemgrRefresh.run_timer and
 	NotifyOut.dispatcher spawn a thread themselves.
 	(Trac #335, svn r3273)

+ 2 - 0
configure.ac

@@ -1127,6 +1127,7 @@ AC_CONFIG_FILES([Makefile
                  compatcheck/Makefile
                  src/Makefile
                  src/bin/Makefile
+                 src/bin/bind10/bind10
                  src/bin/bind10/Makefile
                  src/bin/bind10/tests/Makefile
                  src/bin/cmdctl/Makefile
@@ -1376,6 +1377,7 @@ AC_OUTPUT([doc/version.ent
            chmod +x src/bin/xfrin/run_b10-xfrin.sh
            chmod +x src/bin/xfrout/run_b10-xfrout.sh
            chmod +x src/bin/zonemgr/run_b10-zonemgr.sh
+           chmod +x src/bin/bind10/bind10
            chmod +x src/bin/bind10/run_bind10.sh
            chmod +x src/bin/cmdctl/tests/cmdctl_test
            chmod +x src/bin/dbutil/run_dbutil.sh

+ 7 - 4
src/bin/bind10/Makefile.am

@@ -15,14 +15,17 @@ noinst_SCRIPTS = run_bind10.sh
 
 bind10dir = $(pkgdatadir)
 bind10_DATA = init.spec
-EXTRA_DIST = init.spec
+EXTRA_DIST = init.spec bind10.in
 
-man_MANS = b10-init.8
-DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST += $(man_MANS) b10-init.xml init_messages.mes
+man_MANS = b10-init.8 bind10.8
+DISTCLEANFILES = $(man_MANS) bind10
+EXTRA_DIST += $(man_MANS) b10-init.xml bind10.xml init_messages.mes
 
 if GENERATE_DOCS
 
+bind10.8: bind10.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml
+
 b10-init.8: b10-init.xml
 	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-init.xml
 

+ 0 - 2
src/bin/bind10/bind10

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec b10-init $*

+ 4 - 0
src/bin/bind10/bind10.in

@@ -0,0 +1,4 @@
+#!/bin/sh
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+exec @libexecdir@/@PACKAGE@/b10-init $*

+ 76 - 0
src/bin/bind10/bind10.xml

@@ -0,0 +1,76 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+	       [<!ENTITY mdash "&#8212;">]>
+<!--
+ - Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ -
+ - Permission to use, copy, modify, and/or distribute this software for any
+ - purpose with or without fee is hereby granted, provided that the above
+ - copyright notice and this permission notice appear in all copies.
+ -
+ - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ - AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ - PERFORMANCE OF THIS SOFTWARE.
+-->
+
+<refentry>
+
+  <refentryinfo>
+    <date>April 12, 2012</date>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>bind10</refentrytitle>
+    <manvolnum>8</manvolnum>
+    <refmiscinfo>BIND10</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>bind10</refname>
+    <refpurpose>BIND 10 start script</refpurpose>
+  </refnamediv>
+
+  <docinfo>
+    <copyright>
+      <year>2013</year>
+      <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
+    </copyright>
+  </docinfo>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>bind10</command>
+      <arg><option>options</option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>The <command>bind10</command> script is a simple wrapper that
+    starts BIND10 by running the <command>b10-init</command> daemon. All
+    options passed to <command>bind10</command> are directly passed on to
+    <command>b10-init</command>.</para>
+
+  </refsect1>
+
+  <refsect1>
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry>
+        <refentrytitle>b10-init</refentrytitle><manvolnum>1</manvolnum>
+      </citerefentry>,
+      <citetitle>BIND 10 Guide</citetitle>.
+    </para>
+  </refsect1>
+
+  <refsect1 id='history'><title>HISTORY</title>
+    <para>The <command>bind10</command> script was added in Januari 2013
+    </para>
+  </refsect1>
+
+</refentry>

+ 1 - 1
src/bin/bind10/run_bind10.sh.in

@@ -45,5 +45,5 @@ export B10_FROM_BUILD
 BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
 export BIND10_MSGQ_SOCKET_FILE
 
-exec ${BIND10_PATH}/bind10 "$@"
+exec ${BIND10_PATH}/b10-init "$@"