diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2006-01-24 23:09:00 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2006-01-24 23:09:00 +0000 |
| commit | 7ab48c2a8a30e7b2c13694049612ca4f83a62a49 (patch) | |
| tree | e0bf8de453bf242ec619446a06500eb50838262e /eclass/mysql.eclass | |
| parent | Minor fix for the previous patch to keep ppc64 working. (diff) | |
| download | historical-7ab48c2a8a30e7b2c13694049612ca4f83a62a49.tar.gz historical-7ab48c2a8a30e7b2c13694049612ca4f83a62a49.tar.bz2 historical-7ab48c2a8a30e7b2c13694049612ca4f83a62a49.zip | |
make replace in config files effective
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 074af3789208..373b1f132a0a 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.8 2006/01/24 19:14:00 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.9 2006/01/24 23:09:00 vivo Exp $ # Author: Francesco Riosa <vivo at gentoo.org> # Maintainer: Francesco Riosa <vivo at gentoo.org> @@ -422,17 +422,18 @@ mysql_src_install() { # config stuff insinto "${MY_SYSCONFDIR}" doins scripts/mysqlaccess.conf - newins "${FILESDIR}/my.cnf-4.1-r1" my.cnf + sed -e "s!@MY_SUFFIX@!${MY_SUFFIX}!g" \ + -e "s!@DATADIR@!${DATADIR}!g" \ + "${FILESDIR}/my.cnf-4.1-r1" \ + > "${TMPDIR}/my.cnf.ok" +ls -l ${TMPDIR} ${FILESDIR}/my.cnf-4.1-r1 + newins "${TMPDIR}/my.cnf.ok" my.cnf + insinto "/etc/conf.d" newins "${FILESDIR}/mysql-slot.conf.d-r2" "mysql" mysql_version_is_at_least "5.00.11.00" \ && newins "${FILESDIR}/mysqlmanager-slot.conf.d" "mysqlmanager" - sed --in-place \ - -e "s/@MY_SUFFIX@/${MY_SUFFIX}/" \ - -e "s/@DATADIR@/${DATADIR}/" \ - "${D}/etc/mysql${MY_SUFFIX}/my.cnf" - # minimal builds don't have the server if ! useq minimal; then exeinto /etc/init.d @@ -442,7 +443,7 @@ mysql_src_install() { mysql_version_is_at_least "5.00.11.00" \ && newexe "${FILESDIR}/mysqlmanager-slot.rc6" "mysqlmanager" insinto /etc/logrotate.d - sed -e "s!___MY_SUFFIX___!${MY_SUFFIX}!" \ + sed -e "s!___MY_SUFFIX___!${MY_SUFFIX}!g" \ "${FILESDIR}/logrotate-slot.mysql" \ > "${TMPDIR}/logrotate.mysql" newins "${TMPDIR}/logrotate.mysql" "mysql${MY_SUFFIX}" |