diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-05-09 21:37:07 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-09-02 18:25:17 +0200 |
| commit | feea8e73a70fdd58f873ac6428707378c0fc556a (patch) | |
| tree | b39ea30bce426c66f84aaf34b03dfc09d4520f3e /main/mariadb | |
| parent | 6a33a2fb5f9bd80558c46985975afeb91616d319 (diff) | |
| download | aports-feea8e73a70fdd58f873ac6428707378c0fc556a.tar.bz2 aports-feea8e73a70fdd58f873ac6428707378c0fc556a.tar.xz | |
main/mariadb: fix init script not recognizing started instance
Diffstat (limited to 'main/mariadb')
| -rw-r--r-- | main/mariadb/APKBUILD | 6 | ||||
| -rw-r--r-- | main/mariadb/mariadb.initd | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index bf10a4d581..acc41a4251 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -6,7 +6,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=10.2.26 -pkgrel=0 +pkgrel=1 pkgdesc="A fast SQL database server" url="https://www.mariadb.org/" pkgusers="mysql" @@ -80,7 +80,7 @@ builddir="$srcdir/$pkgname-$pkgver" # - CVE-2018-2761 # - CVE-2018-2781 # - CVE-2018-2771 -# - CVE-2018-2813 +# - CVE-2018-2813 # 10.1.22-r0: # - CVE-2017-3313 # - CVE-2017-3302 @@ -339,6 +339,6 @@ _server_utils() { } sha512sums="1eaac1c1dda1017b64249d39d872729d3140d81653240c54f688f64440b1775e5f3a7c5a8486075fa1799411dfb0c2c09b7c1dbb46d95675572d90127048c124 mariadb-10.2.26.tar.gz -06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd +2245995b1287d976b20643140afa4d8ff253ace5b4806443ad5838ae0717547a222595141902ef1a4ef4419bd690aba1a0c8b6306abb90aa9897be004f1a24b9 mariadb.initd 81d2a95bfbce35fab6e1780f4201320e5621f470591020d707801dcf31f5fad3cb5d7b781a186b2914c6559a8fdc8f13e31e7cdde0af360ad56cedf80e491bc0 ppc-remove-glibc-dep.patch 70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63 pcre.cmake.patch" diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd index 143ca8ff54..ebb7053e0b 100644 --- a/main/mariadb/mariadb.initd +++ b/main/mariadb/mariadb.initd @@ -7,8 +7,10 @@ getconf() { retry="60" extra_stopped_commands="setup" +pidfile="/run/mysqld/$RC_SVCNAME.pid" command="/usr/bin/mysqld_safe" -command_args="--syslog --nowatch" +command_args="--syslog --nowatch --pid-file=$pidfile" + depend() { use net need localmount @@ -21,8 +23,6 @@ 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." @@ -33,8 +33,3 @@ start_pre() { start_post() { ewaitfile 10 $(getconf socket "/run/mysqld/mysqld.sock") } - -stop_pre() { - pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid") -} - |