From dc5bc50e49a36a38832d192b2c4da607c0d3f5a1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 23 Sep 2013 16:41:51 +0200 Subject: [PATCH] mariadb: install mysqld-post to /usr/bin (where the systemd service expects it). --- srcpkgs/mariadb/files/{mysqld-post.sh => mysqld-post} | 2 +- srcpkgs/mariadb/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename srcpkgs/mariadb/files/{mysqld-post.sh => mysqld-post} (99%) diff --git a/srcpkgs/mariadb/files/mysqld-post.sh b/srcpkgs/mariadb/files/mysqld-post similarity index 99% rename from srcpkgs/mariadb/files/mysqld-post.sh rename to srcpkgs/mariadb/files/mysqld-post index c4ac181710..240d5ff21d 100644 --- a/srcpkgs/mariadb/files/mysqld-post.sh +++ b/srcpkgs/mariadb/files/mysqld-post @@ -3,6 +3,6 @@ while true; do response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break echo "$response" | grep -q "mysqld is alive" && break - echo "$response" | grep -q "Access denied for user" && break + echo "$response" | grep -q "Access denied for user" && break sleep 1 done diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 8d912bedec..6070915efb 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb version=5.5.33 -revision=1 +revision=2 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -71,7 +71,7 @@ post_install() { # systemd service. vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/mysqld-post.sh 755 usr/lib/systemd/scripts mysqld-post + vinstall ${FILESDIR}/mysqld-post 755 usr/bin vinstall ${FILESDIR}/mysqld.tmpfiles 644 usr/lib/tmpfiles.d mysqld.conf }