commit: 8a176b6845cdfea34006db618985789ec05d606f Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon Oct 2 15:18:54 2017 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon Oct 2 15:20:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a176b68
dev-db/mariadb: Move --user bootstrap option to later in the commands Closes: https://bugs.gentoo.org/show_bug.cgi?id=632694 Package-Manager: Portage-2.3.10, Repoman-2.3.3 dev-db/mariadb/mariadb-10.2.9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.9.ebuild b/dev-db/mariadb/mariadb-10.2.9.ebuild index 8b02d53b17a..a8b5b56814a 100644 --- a/dev-db/mariadb/mariadb-10.2.9.ebuild +++ b/dev-db/mariadb/mariadb-10.2.9.ebuild @@ -929,8 +929,6 @@ pkg_config() { egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}" done - use prefix || options="${options} --user=mysql" - einfo "Creating the mysql database and setting proper permissions on it ..." # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it @@ -963,6 +961,8 @@ pkg_config() { [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \ || die "MySQL databases not installed" + use prefix || options="${options} --user=mysql" + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" local mysqld="${EROOT}/usr/sbin/mysqld \
