diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-07-22 19:10:41 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-07-22 19:10:41 +0300 |
| commit | 62a957c4f5dbac595e0c64fd86ae3e4452ec7995 (patch) | |
| tree | 224a3ba41a7482f6881e82df88a1d28c4a0c7990 /main | |
| parent | 16c0b18f93e2790e8d84712699f4b49037ae2762 (diff) | |
| download | aports-62a957c4f5dbac595e0c64fd86ae3e4452ec7995.tar.bz2 aports-62a957c4f5dbac595e0c64fd86ae3e4452ec7995.tar.xz | |
main/mariadb: wait for socket on startup
Diffstat (limited to 'main')
| -rw-r--r-- | main/mariadb/APKBUILD | 8 | ||||
| -rw-r--r-- | main/mariadb/mariadb.initd | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index ba16307dc..cc08004b2 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -4,7 +4,7 @@ pkgname=mariadb pkgver=5.5.43 -pkgrel=4 +pkgrel=5 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -179,14 +179,14 @@ _compat_client() { _compat mysql-client mariadb-client; } _compat_bench() { _compat mysql-bench mariadb-client; } md5sums="c8760d6b5890fc1de76c07af48092c88 mariadb-5.5.43.tar.gz -e8789d2e9a79c962d857512609b962a9 mariadb.initd +62fb1ce5bad87bb15cf8e289ce686885 mariadb.initd bcaee4dbbf77f4432ecd9796714be75b fix-mysql-install-db-path.patch 4be445c305df3cca61aa9a40a1886964 mariadb-10.0.18-MDEV-8115.patch" sha256sums="a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01 mariadb-5.5.43.tar.gz -90fa154aa5588dd5df42befd11984e2e59d55cd919db246f76859d719b870c8f mariadb.initd +696fa87b87f37b6c310da6c1ef5f8759bd5b4b1654fbcf0561c9f0592bfa8dd9 mariadb.initd 52e3827529b53c02a9ba263bd395bde773d2666853b252a131e824bb256f36d5 fix-mysql-install-db-path.patch fee272aaaf1f3c427e986a4fa4c4c9362b45181ce4799e60f3ba856aedf2efa7 mariadb-10.0.18-MDEV-8115.patch" sha512sums="fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db mariadb-5.5.43.tar.gz -a8c7589e9c64e44d358c2720f13625746f6cc2ea0f6ce25d7aefc7e90fad581b30f39a3a829d774b5eae986307f1c9baf5f1f6a7f09b664360462878881de57f mariadb.initd +510207ba29ef40e017840fb39bc51285374d2e2ed0d70eb65916e5415e6a993af19b4fd3b579af89173b1e3b0d7c5115d8f43b22c16596b4a83a9f8353154400 mariadb.initd 4aca6e42f4dec9d7122388b1d1bc40762a4677a1beafcf448b900d443a2f778a8fd52bc7f1b5c9697e0ad13473e6d01eb29607a40de195ac07857cd4dfc2a1fe fix-mysql-install-db-path.patch e8e370bb0d09151ea718a5e09c4f92c4d9d2e05e59699e1a0fb2003bc161f16a0397cd1bc4ebca2a7e74595ad159bb225e559192658b1bdeb7534d8f80558d35 mariadb-10.0.18-MDEV-8115.patch" diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd index 73105ff20..8409bad26 100644 --- a/main/mariadb/mariadb.initd +++ b/main/mariadb/mariadb.initd @@ -39,15 +39,19 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting mysqld" - start-stop-daemon --pidfile $pidfile \ + if start-stop-daemon --pidfile $pidfile \ --start \ --background \ --stdout /dev/null \ --stderr /dev/null \ - --wait 1500 \ -- \ - /usr/bin/mysqld_safe --pid-file=$pidfile - eend $? + /usr/bin/mysqld_safe --pid-file=$pidfile; then + + ewaitfile 10 /run/mysqld/mysqld.sock + eend 0 + else + eend $? + fi } stop () { |