Revision bump. Update checkconfig section to accept alternate configurations. Thanks to László Szalma <dblaci@dblaci.hu> for the input. wrt bug 522766

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

3 files changed, 28 insertions, 14 deletions

diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
index ca4b4d2a1026..b274ee72ac8b 100644
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-init-scripts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.41 2014/08/21 03:08:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.42 2014/09/15 14:17:12 grknight Exp $
+
+*mysql-init-scripts-2.0-r1 (15 Sep 2014)
+
+  15 Sep 2014;  <grknight@gentoo.org> +mysql-init-scripts-2.0-r1.ebuild,
+  -mysql-init-scripts-2.0.ebuild, files/init.d-2.0:
+  Revision bump.  Update checkconfig section to accept alternate configurations.
+  Thanks to László Szalma <dblaci@dblaci.hu> for the input. wrt bug 522766
 
 *mysql-init-scripts-2.0 (21 Aug 2014)
 
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.0 b/dev-db/mysql-init-scripts/files/init.d-2.0
index c7e5eaf619d1..d0a0db011b61 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.0
+++ b/dev-db/mysql-init-scripts/files/init.d-2.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0,v 1.1 2014/08/21 03:08:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0,v 1.2 2014/09/15 14:17:12 grknight Exp $
 
 extra_commands="checkconfig"
 
@@ -134,19 +134,26 @@ stop() {
 }
 
 checkconfig() {
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	ebegin "Checking mysqld configuration"
-
-	# Suppress output to check the return value
-	"${basedir}"/sbin/mysqld --help --verbose &> /dev/null
-
-	# If the above command does not return 0,
-	# then there is an error to echo to the user
-	if [ $? -ne 0 ] ; then
-		"${basedir}"/sbin/mysqld --help --verbose > /dev/null
+	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
+	local svc_name=$(mysql_svcname)
+	ebegin "Checking mysqld configuration for ${svc_name}"
+
+	if [ ${RC_CMD} == "checkconfig" ] ; then
+		# We are calling checkconfig specifically.  Print warnings regardless.
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+	else
+		# Suppress output to check the return value
+		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
+
+		# If the above command does not return 0,
+		# then there is an error to echo to the user
+		if [ $? -ne 0 ] ; then
+			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
+		fi
 	fi
 
-	eend $? "MySQL config check failed"
+	eend $? "${svc_name} config check failed"
 }
 
 # vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
index f0ca91e57048..f180ce216140 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0.ebuild,v 1.1 2014/08/21 03:08:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild,v 1.1 2014/09/15 14:17:12 grknight Exp $
 
 EAPI=5