dev-db/mysql-init-scripts: Minor refinements to the 2.2 init scripts

Package-Manager: Portage-2.3.6, Repoman-2.3.3
This commit is contained in:
Brian Evans
2017-07-24 10:04:21 -04:00
parent d022b71b74
commit d97f1c09eb
2 changed files with 11 additions and 11 deletions

View File

@@ -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

View File

@@ -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}))"