From 48c1541f9967f4f357a078dea9bc322db39bf813 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 9 May 2019 21:37:07 +0200
Subject: main/mariadb: fix init script not recognizing started instance

---
 main/mariadb/APKBUILD      | 4 ++--
 main/mariadb/mariadb.initd | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'main/mariadb')

diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index e2069a1b8f..7ee0a897b6 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -7,7 +7,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb
 pkgver=10.3.13
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast SQL database server"
 url="https://www.mariadb.org"
 pkgusers="mysql"
@@ -422,7 +422,7 @@ _plugin_rocksdb() {
 }
 
 sha512sums="3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd  mariadb-10.3.13.tar.gz
-eb9a0b781165975c96eb0cfc0e8544b10cdee7e8a731b4c3c51c1758e6336babe65fa5bec159fd8c49de52d0564e8240aa8bdd27062c4ecf0d09ed3e052df4d5  mariadb.initd
+c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c  mariadb.initd
 b4469f2f0299e71c09b65c91373f2d72b7fe9a9cd58ad24737a78a8097473b29c32b7267e173a2dfe1158f2f7d40a7fb02fb1b35caeda44d16ae3b9e2602a75f  fix-c11-atomics-check.patch
 e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd  ppc-remove-glibc-dep.patch
 70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63  pcre.cmake.patch"
diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd
index fb0c89a9e9..0d914bde58 100644
--- a/main/mariadb/mariadb.initd
+++ b/main/mariadb/mariadb.initd
@@ -2,8 +2,9 @@
 extra_stopped_commands="setup"
 
 retry="60"
+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
@@ -11,8 +12,6 @@ depend() {
 }
 
 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
@@ -25,10 +24,6 @@ start_post() {
 	ewaitfile 10 $(getconf socket "/run/mysqld/mysqld.sock")
 }
 
-stop_pre() {
-	pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid")
-}
-
 setup() {
 	ebegin "Creating a new MySQL database"
 	mysql_install_db --user=mysql --datadir=/var/lib/mysql
-- 
cgit v1.2.3