All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ryan Coe <bluemrp9@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 5/8] package/mariadb: rename variable in sysv startup script
Date: Mon,  3 Feb 2020 17:21:57 -0800	[thread overview]
Message-ID: <20200204012200.7273-5-bluemrp9@gmail.com> (raw)
In-Reply-To: <20200204012200.7273-1-bluemrp9@gmail.com>

This patch renames MYSQL_PID to MYSQL_PIDFILE in the startup script. This
is in anticipation for some upcoming changes.

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
Changes v2 -> v3:
  - separate changes into seperate patches (suggested by Thomas)
Changes v1 -> v2:
  - no change
---
 package/mariadb/S97mysqld | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/mariadb/S97mysqld b/package/mariadb/S97mysqld
index 7f9ced31e9..ffd3712400 100644
--- a/package/mariadb/S97mysqld
+++ b/package/mariadb/S97mysqld
@@ -5,7 +5,7 @@
 
 MYSQL_LIB="/var/lib/mysql"
 MYSQL_RUN="/run/mysql"
-MYSQL_PID="$MYSQL_RUN/mysqld.pid"
+MYSQL_PIDFILE="$MYSQL_RUN/mysqld.pid"
 MYSQL_BIN="/usr/bin"
 
 wait_for_ready() {
@@ -41,7 +41,7 @@ start() {
 	# We don't use start-stop-daemon because mysqld has its own
 	# wrapper script.
 	printf "Starting mysql ... "
-	$MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PID --user=mysql \
+	$MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PIDFILE --user=mysql \
 		> /dev/null 2>&1 &
 	wait_for_ready
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
@@ -49,8 +49,8 @@ start() {
 
 stop() {
 	printf "Stopping mysql ... "
-	if [ -f $MYSQL_PID ]; then
-		kill `cat $MYSQL_PID` > /dev/null 2>&1
+	if [ -f $MYSQL_PIDFILE ]; then
+		kill `cat $MYSQL_PIDFILE` > /dev/null 2>&1
 		[ $? = 0 ] && echo "OK" || echo "FAIL"
 	else
 		echo "FAIL"
-- 
2.25.0

  parent reply	other threads:[~2020-02-04  1:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-04  1:21 [Buildroot] [PATCH v3 1/8] package/mariadb: fix permissions of data dir when using systemd Ryan Coe
2020-02-04  1:21 ` [Buildroot] [PATCH v3 2/8] package/mariadb: remove mariadb_config from target Ryan Coe
2020-02-04 13:38   ` Peter Korsgaard
2020-03-10 20:30   ` Peter Korsgaard
2020-02-04  1:21 ` [Buildroot] [PATCH v3 3/8] package/mariadb: add sysroot path to mariadb_config Ryan Coe
2020-02-04 13:45   ` Peter Korsgaard
2020-02-04  1:21 ` [Buildroot] [PATCH v3 4/8] package/mariadb: fix potential error message in sysv startup script Ryan Coe
2020-02-04 13:48   ` Peter Korsgaard
2020-03-10 20:30   ` Peter Korsgaard
2020-02-04  1:21 ` Ryan Coe [this message]
2020-02-04 13:52   ` [Buildroot] [PATCH v3 5/8] package/mariadb: rename variable " Peter Korsgaard
2020-02-04  1:21 ` [Buildroot] [PATCH v3 6/8] package/mariadb: explicitly define logging directory to mysqld Ryan Coe
2020-02-04 13:54   ` Peter Korsgaard
2020-02-04  1:21 ` [Buildroot] [PATCH v3 7/8] package/mariadb: do not pass --user=mysql to mysql_install_db Ryan Coe
2020-02-04 13:55   ` Peter Korsgaard
2020-02-04  1:22 ` [Buildroot] [PATCH v3 8/8] package/mariadb: security bump version to 10.4.12 Ryan Coe
2020-02-04 14:02   ` Peter Korsgaard
2020-02-04 13:38 ` [Buildroot] [PATCH v3 1/8] package/mariadb: fix permissions of data dir when using systemd Peter Korsgaard
2020-03-07 21:23 ` Peter Korsgaard
2020-03-08  8:39   ` Baruch Siach
2020-03-08  8:52     ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200204012200.7273-5-bluemrp9@gmail.com \
    --to=bluemrp9@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.