From: Martin Schwenke Date: Sun, 12 Jul 2026 22:32:39 +0000 (+1000) Subject: ctdb-scripts: Admit that ctdb.init is an example X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=054225557e968c78d7403c187eaccd84b37d02f7;p=thirdparty%2Fsamba.git 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 Reviewed-by: Anoop C S --- diff --git a/ctdb/config/README b/ctdb/config/README index 3fd1583ecee..39aeb6c9316 100644 --- 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 02f552aee32..b4f9911bf1a 100644 --- 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 23b0008d83b..8206261316d 100644 --- 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 6522d996d40..09256f32b36 100644 --- 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"