[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/files/, dev-db/mysql-init-scripts/

["Brian Evans" <grknight@gentoo.org>]

commit:     0f5653d2d0a3d6a52cfd12f6329e948e8522698b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 13:15:19 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 13:20:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5653d2

dev-db/mysql-init-scripts: Fix MariaDB-only option bug 626186, add supervisor script

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-db/mysql-init-scripts/files/init.d-2.2         |  2 +-
 dev-db/mysql-init-scripts/files/init.d-s6-2.2      |  2 +-
 .../files/{init.d-2.2 => init.d-supervise}         | 27 +++++++---------------
 ...2.2.ebuild => mysql-init-scripts-2.2-r1.ebuild} |  1 +
 4 files changed, 11 insertions(+), 21 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 d217744de9c..124d2e993eb 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2
@@ -15,7 +15,7 @@ depend() {
 }
 
 get_config() {
-	my_print_defaults --defaults-file="$1" --mysqld |
+	my_print_defaults --defaults-file="$1" mysqld server mariadb |
 	sed -n -e "s/^--$2=//p"
 }
 

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 427061aa990..46980fab9c3 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
@@ -9,7 +9,7 @@ depend() {
 }
 
 get_config() {
-	my_print_defaults --defaults-file="$1" --mysqld |
+	my_print_defaults --defaults-file="$1" mysqld server mariadb |
 	sed -n -e "s/^--$2=//p"
 }
 

diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-supervise
similarity index 90%
copy from dev-db/mysql-init-scripts/files/init.d-2.2
copy to dev-db/mysql-init-scripts/files/init.d-supervise
index d217744de9c..5341a6a18d6 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-supervise
@@ -15,7 +15,7 @@ depend() {
 }
 
 get_config() {
-	my_print_defaults --defaults-file="$1" --mysqld |
+	my_print_defaults --defaults-file="$1" mysqld server mariadb |
 	sed -n -e "s/^--$2=//p"
 }
 
@@ -118,18 +118,16 @@ start() {
 	fi
 
 	local startup_timeout=${STARTUP_TIMEOUT:-900}
-	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+#	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
 	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
 	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	start-stop-daemon \
+	supervise-daemon \
 		${DEBUG:+"--verbose"} \
-		--start \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--background \
-		--wait ${startup_early_timeout} \
+		--pidfile "/run/${SVCNAME}.pid" \
 		${tmpnice} \
 		${tmpionice} \
+		--start \
+		"${basedir}"/sbin/mysqld \
 		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
 	local ret=$?
 	if [ ${ret} -ne 0 ] ; then
@@ -139,9 +137,6 @@ start() {
 
 	ewaitfile ${startup_timeout} "${socket}"
 	eend $? || return 1
-
-	save_options pidfile "${pidfile}"
-	save_options basedir "${basedir}"
 }
 
 stop() {
@@ -151,16 +146,10 @@ stop() {
 
 	ebegin "Stopping $(mysql_svcname)"
 
-	local pidfile="$(get_options pidfile)"
-	local basedir="$(get_options basedir)"
-	local stop_timeout=${STOP_TIMEOUT:-120}
-
-	start-stop-daemon \
+	supervise-daemon \
 		${DEBUG:+"--verbose"} \
 		--stop \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--retry ${stop_timeout}
+		--pidfile "/run/${SVCNAME}.pid"
 	eend $?
 }
 

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild
similarity index 96%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild
index 13ebfb9e379..75b8390652f 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild
@@ -37,6 +37,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}/init.d-2.2" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
 
 	# systemd unit installation
 	exeinto /usr/libexec