ctdb-scripts: Admit that ctdb.init is an example

ctdb.init is basically unmaintained and untested.  It is only really
referenced by ctdb.spec.in, which is in ctdb/doc/examples/.  Move
ctdb.init there too.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/config/README b/ctdb/config/README
index 3fd1583eceec6376bc4d4240a260d00dd2e9c964..39aeb6c931692aeda81c65a83e91c78fe512a9af 100644 (file)
--- a/ctdb/config/README
+++ b/ctdb/config/README
@@ -2,10 +2,6 @@ This directory contains run-time support scripts for CTDB.
 
 Selected highlights:
 
-  ctdb.init
-
-    An initscript for starting ctdbd at boot time.
-
   events/
 
     Eventscripts.  See events/README for more details.

diff --git a/ctdb/doc/examples/README b/ctdb/doc/examples/README
index 02f552aee32f758312feb60a182f6a552cef4f7c..b4f9911bf1ae8d29a02b31286afd077b37e296d0 100644 (file)
--- a/ctdb/doc/examples/README
+++ b/ctdb/doc/examples/README
@@ -1,5 +1,7 @@
 This directory includes...
 
+A sample CTDB initscript (ctdb.init).
+
 Sample CTDB configuration files:
 
   o ctdb.conf        - Main configuration file

diff --git a/ctdb/config/ctdb.init b/ctdb/doc/examples/ctdb.init
similarity index 100%
rename from ctdb/config/ctdb.init
rename to ctdb/doc/examples/ctdb.init

diff --git a/ctdb/doc/examples/ctdb.spec.in b/ctdb/doc/examples/ctdb.spec.in
index 23b0008d83b202b77cfd687e6dd2dda875136169..8206261316d26b4af0aaf672ef4903bea8bea2a1 100644 (file)
--- a/ctdb/doc/examples/ctdb.spec.in
+++ b/ctdb/doc/examples/ctdb.spec.in
@@ -123,7 +123,7 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 755 config/ctdb.service $RPM_BUILD_ROOT%{_unitdir}
 %else
 mkdir -p $RPM_BUILD_ROOT%{initdir}
-install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
+install -m755 doc/examples/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
 %endif
 
 # This is a hack. All documents should be installed in /usr/share/doc.

diff --git a/ctdb/tests/scripts/script_install_paths.sh b/ctdb/tests/scripts/script_install_paths.sh
index 6522d996d40df8bb7bda192211549b1a5aee64ec..09256f32b366b96c83d59e5287a69c435b313605 100644 (file)
--- a/ctdb/tests/scripts/script_install_paths.sh
+++ b/ctdb/tests/scripts/script_install_paths.sh
@@ -37,7 +37,7 @@ if ! $CTDB_TESTS_ARE_INSTALLED; then
        CTDB_SCRIPTS_TESTS_LIBEXEC_DIR="$bin_dir"
 
        # Only for shellcheck unit tests
-       CTDB_SCRIPTS_INIT_SCRIPT="${ctdb_dir}/config/ctdb.init"
+       CTDB_SCRIPTS_INIT_SCRIPT="${ctdb_dir}/doc/examples/ctdb.init"
        CTDB_SCRIPTS_TESTS_BIN_DIR="$CTDB_TEST_DIR"
        CTDB_SCRIPTS_TOOLS_BIN_DIR="${ctdb_dir}/tools"
        CTDB_SCRIPTS_TOOLS_HELPER_DIR="${ctdb_dir}/tools"