diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-26 12:25:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-26 12:25:19 +0000 |
| commit | 0490e9d01f124c22a0e0817d88f54f13ee269e2f (patch) | |
| tree | 4a0da6d8619024043b4430c2a1a883ce81ada36b /main/mariadb | |
| parent | ef1dfb7ff1fe482f1221205c20516675d5c5940b (diff) | |
| download | aports-0490e9d01f124c22a0e0817d88f54f13ee269e2f.tar.bz2 aports-0490e9d01f124c22a0e0817d88f54f13ee269e2f.tar.xz | |
main/mariadb: fix initd script
pass the pidfile to the daemon in start_pre
Diffstat (limited to 'main/mariadb')
| -rw-r--r-- | main/mariadb/APKBUILD | 8 | ||||
| -rw-r--r-- | main/mariadb/mariadb.initd | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index af439bbe5b..8ee38f3662 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=10.1.14 -pkgrel=0 +pkgrel=1 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -178,14 +178,14 @@ _compat_client() { _compat mysql-client mariadb-client; } _compat_bench() { _compat mysql-bench mariadb-client; } md5sums="294925531e0fd2f0461e3894496a5adc mariadb-10.1.14.tar.gz -a9d5617bc49ab1994d34012426a282c5 mariadb.initd +195f8bf24dfdbc5aa7ccd969a1b1283f mariadb.initd b233fb7015a9659f5b825cd8010d2b52 fix-mysql-install-db-path.patch 96b7247f919bf4e1de13a9d0ce7ef515 fix-ucontext-check.patch" sha256sums="18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 mariadb-10.1.14.tar.gz -b379b90f38dffc5c9bc56576cee5c485c63cfcda2cf007fa03e6aae070d4f3c8 mariadb.initd +c37aa7c150c07a3ac478a6fd1b478b425c17ac412f9ba4f49b8a635edb6ed542 mariadb.initd 0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904 fix-mysql-install-db-path.patch 3d9a12bf04fcf215567b6a395fe83fb6528602baf4283d42181bd73f93b5f538 fix-ucontext-check.patch" sha512sums="dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf mariadb-10.1.14.tar.gz -6478b546f60a7f4c33e3e0edc82555b3b08050ad763a14bde17c8967c1511763ce6edeaf42ac8dedbc0ed344b55df8301b8dea91c08029d592a69fc693d990ce mariadb.initd +06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch 82fa93411483f5d1b57d978087a891bcab6a011e45c2d79b08d28718f5717994b423fc81d2170dad2fe65303153ac29655a81ce5039e73e37cebb159392a86cf fix-ucontext-check.patch" diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd index a652ffaf3f..143ca8ff54 100644 --- a/main/mariadb/mariadb.initd +++ b/main/mariadb/mariadb.initd @@ -8,8 +8,7 @@ getconf() { retry="60" extra_stopped_commands="setup" command="/usr/bin/mysqld_safe" -command_args="--pid-file=$pidfile --syslog --nowatch" - +command_args="--syslog --nowatch" depend() { use net need localmount @@ -23,6 +22,7 @@ setup() { start_pre() { pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid") + command_args="$command_args --pid-file=$pidfile" required_dirs=$(getconf datadir "/var/lib/mysql") if [ ! -d $required_dirs/mysql ]; then eerror "Datadir '$required_dirs' is empty or invalid." |