diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 54169ce29..f82d6ee86 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') -pkgver=10.0.16 +pkgver=10.0.17 _pkgver=${pkgver/.a/a} pkgrel=1 arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -md5sums=('7b1a197ea5d4027833a3a2ed26fc4cae' +md5sums=('3101d1e79c1b04699cde10780f959625' 'd488fffa9f62f9949c4aa1bb6e6db692' 'b79e65a5aa536e6b5bc60988eb0b78a2' '2fa6e456964d4ff5e6d4f9ff0126aed6') diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install index 595bc4c4d..8b12932f3 100644 --- a/extra/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install @@ -1,18 +1,16 @@ -if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then - datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p") -fi -[[ -z $datadir ]] && datadir=/var/lib/mysql - post_install(){ groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null if [[ ! -e $datadir ]]; then - install -dm700 $datadir - usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir + install -dm700 var/lib/mysql chown -R mysql:mysql var/lib/mysql &>/dev/null fi + echo ":: You need to initialize the MariaDB data directory prior to starting" + echo " the service. This can be done with mysql_install_db command, e.g.:" + echo " mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql" + usr/bin/systemd-tmpfiles --create mysql.conf }