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