grknight 15/05/27 21:01:03 Modified: run-s6 init.d-s6 log-s6 Log: Version bump to correct s6 support for dependencies and sourcing (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)
Revision Changes Path 1.2 dev-db/mysql-init-scripts/files/run-s6 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/run-s6?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/run-s6?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/run-s6?r1=1.1&r2=1.2 Index: run-s6 =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/run-s6,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- run-s6 27 May 2015 17:02:26 -0000 1.1 +++ run-s6 27 May 2015 21:01:03 -0000 1.2 @@ -1,18 +1,7 @@ #!/bin/sh # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/run-s6,v 1.1 2015/05/27 17:02:26 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/run-s6,v 1.2 2015/05/27 21:01:03 grknight Exp $ -get_config() { - my_print_defaults --config-file="$1" mysqld | - sed -n -e "s/^--$2=//p" -} - -SVCNAME=$(cd `dirname $0` && pwd | awk -F/ '{ print $NF }' ) - -source "${ROOT:-/}etc/conf.d/${SVCNAME}" - -MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}" - -basedir=$(get_config "${MY_CNF}" basedir | tail -n1) -exec "${basedir}"/sbin/mysqld --defaults-file="${MY_CNF}" ${MY_ARGS} 2>&1 +if [ -e ./env ] ; then source ./env ; else echo "failed to source env" ; fi +exec "${basedir}/sbin/mysqld" --defaults-file="${MY_CNF}" ${MY_ARGS} 2>&1 1.2 dev-db/mysql-init-scripts/files/init.d-s6 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-s6?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-s6?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-s6?r1=1.1&r2=1.2 Index: init.d-s6 =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-s6,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- init.d-s6 27 May 2015 17:02:26 -0000 1.1 +++ init.d-s6 27 May 2015 21:01:03 -0000 1.2 @@ -1,7 +1,7 @@ #!/sbin/openrc-run # Copyright 1999-2015 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-s6,v 1.1 2015/05/27 17:02:26 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-s6,v 1.2 2015/05/27 21:01:03 grknight Exp $ depend() { use net.lo @@ -41,6 +41,7 @@ fi # tail -n1 is critical as these we only want the last instance of the option + local basedir=$(get_config "${MY_CNF}" basedir | tail -n1) local datadir=$(get_config "${MY_CNF}" datadir | tail -n1) local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1) local socket=$(get_config "${MY_CNF}" socket | tail -n1) @@ -77,6 +78,14 @@ eerror "Directory $piddir for pidfile does not exist and cannot be created" return 1 fi + + # Prepare env files to source + mkdir -p "/var/svc.d/${SVCNAME}" + echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${SVCNAME}/env" + echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${SVCNAME}/env" + echo "basedir=\"${basedir}\"" >> "/var/svc.d/${SVCNAME}/env" + mkdir -p "/var/svc.d/${SVCNAME}/log" + echo "SVCNAME=\"${SVCNAME}\"" > "/var/svc.d/${SVCNAME}/log/env" } start_post() { 1.2 dev-db/mysql-init-scripts/files/log-s6 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/log-s6?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/log-s6?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/log-s6?r1=1.1&r2=1.2 Index: log-s6 =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/log-s6,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- log-s6 27 May 2015 17:02:26 -0000 1.1 +++ log-s6 27 May 2015 21:01:03 -0000 1.2 @@ -1,9 +1,9 @@ #!/bin/sh # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/log-s6,v 1.1 2015/05/27 17:02:26 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/log-s6,v 1.2 2015/05/27 21:01:03 grknight Exp $ -SVCNAME=$(cd `dirname $0` && pwd | awk -F/ '{ print $--NF }' ) +if [ -e ./env ] ; then source ./env ; else echo "failed to source env" ; fi mkdir -p "/var/log/mysql/${SVCNAME}" if [ ${S6_LOG_OPTIONS} ] ; then exec s6-log ${S6_LOG_OPTIONS}
