commit: d97f1c09eb25b28a65aedafa11a0c850a6438c7d Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon Jul 24 14:04:21 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon Jul 24 14:04:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97f1c09
dev-db/mysql-init-scripts: Minor refinements to the 2.2 init scripts Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-db/mysql-init-scripts/files/init.d-2.2 | 10 +++++----- dev-db/mysql-init-scripts/files/init.d-s6-2.2 | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2 index f798052bb37..d217744de9c 100644 --- a/dev-db/mysql-init-scripts/files/init.d-2.2 +++ b/dev-db/mysql-init-scripts/files/init.d-2.2 @@ -2,7 +2,11 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -extra_commands="checkconfig bootstrap_galera" +extra_commands="checkconfig" +extra_stopped_commands="boostrap_galera" + +description_checkconfig="Verify the server's configuration" +description_boostrap_galera="Start a new Galera cluster with this server as the initial node" depend() { use net.lo @@ -27,10 +31,6 @@ mysql_svcname() { stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; } bootstrap_galera() { - if ! service_stopped ; then - eerror "The server cannot be running to perform this action" - return 1 - fi MY_ARGS="--wsrep-new-cluster ${MY_ARGS}" mark_service_starting if start ; then diff --git a/dev-db/mysql-init-scripts/files/init.d-s6-2.2 b/dev-db/mysql-init-scripts/files/init.d-s6-2.2 index 6e7bce3d9f1..427061aa990 100644 --- a/dev-db/mysql-init-scripts/files/init.d-s6-2.2 +++ b/dev-db/mysql-init-scripts/files/init.d-s6-2.2 @@ -25,13 +25,9 @@ mysql_svcname() { stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; } bootstrap_galera() { - if ! service_stopped ; then - eerror "The server cannot be running to perform this action" - return 1 - fi MY_ARGS="--wsrep-new-cluster ${MY_ARGS}" mark_service_starting - if start ; then + if start_pre && start ; then mark_service_started return 0 else @@ -41,7 +37,11 @@ bootstrap_galera() { } -extra_commands="checkconfig boostrap_galera" +extra_commands="checkconfig" +extra_stopped_commands="boostrap_galera" + +description_checkconfig="Verify the server's configuration" +description_boostrap_galera="Start a new Galera cluster with this server as the initial node" supervisor=s6 name=$(mysql_svcname) s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"