CVS commit: pkgsrc/databases

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Mar  7 11:06:28 UTC 2023

Modified Files:
        pkgsrc/databases/mariadb104-server/files/smf: mariadb.sh
        pkgsrc/databases/mariadb105-server/files/smf: mariadb.sh
        pkgsrc/databases/mariadb106-server/files/smf: mariadb.sh

Log Message:
mariadb*-server: Run mysql_install_db if required.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb104-server/files/smf/mariadb.sh
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb105-server/files/smf/mariadb.sh
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb106-server/files/smf/mariadb.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb104-server/files/smf/mariadb.sh
diff -u pkgsrc/databases/mariadb104-server/files/smf/mariadb.sh:1.2 pkgsrc/databases/mariadb104-server/files/smf/mariadb.sh:1.3
--- pkgsrc/databases/mariadb104-server/files/smf/mariadb.sh:1.2 Fri Feb 10 09:44:01 2023
+++ pkgsrc/databases/mariadb104-server/files/smf/mariadb.sh     Tue Mar  7 11:06:28 2023
@@ -1,6 +1,6 @@
 #!@SMF_METHOD_SHELL@
 #
-# $NetBSD: mariadb.sh,v 1.2 2023/02/10 09:44:01 jperkin Exp $
+# $NetBSD: mariadb.sh,v 1.3 2023/03/07 11:06:28 jperkin Exp $
 #
 # Init script for mysqld.
 #
@@ -13,6 +13,12 @@ ulimit -n 10240
 
 case "$1" in
 start)
+       if [ ! -d @MARIADB_DATADIR@/mysql ]; then
+               @LOCALBASE@/bin/mysql_install_db \
+                       --datadir=@MARIADB_DATADIR@ \
+                       --user=@MARIADB_USER@
+       fi
+
        @LOCALBASE@/sbin/mysqld --user=@MARIADB_USER@ \
                --basedir=@LOCALBASE@ \
                --datadir=@MARIADB_DATADIR@ \

Index: pkgsrc/databases/mariadb105-server/files/smf/mariadb.sh
diff -u pkgsrc/databases/mariadb105-server/files/smf/mariadb.sh:1.2 pkgsrc/databases/mariadb105-server/files/smf/mariadb.sh:1.3
--- pkgsrc/databases/mariadb105-server/files/smf/mariadb.sh:1.2 Fri Feb 10 09:44:01 2023
+++ pkgsrc/databases/mariadb105-server/files/smf/mariadb.sh     Tue Mar  7 11:06:28 2023
@@ -1,6 +1,6 @@
 #!@SMF_METHOD_SHELL@
 #
-# $NetBSD: mariadb.sh,v 1.2 2023/02/10 09:44:01 jperkin Exp $
+# $NetBSD: mariadb.sh,v 1.3 2023/03/07 11:06:28 jperkin Exp $
 #
 # Init script for mysqld.
 #
@@ -13,6 +13,12 @@ ulimit -n 10240
 
 case "$1" in
 start)
+       if [ ! -d @MARIADB_DATADIR@/mysql ]; then
+               @LOCALBASE@/bin/mysql_install_db \
+                       --datadir=@MARIADB_DATADIR@ \
+                       --user=@MARIADB_USER@
+       fi
+
        @LOCALBASE@/sbin/mariadbd --user=@MARIADB_USER@ \
                --basedir=@LOCALBASE@ \
                --datadir=@MARIADB_DATADIR@ \

Index: pkgsrc/databases/mariadb106-server/files/smf/mariadb.sh
diff -u pkgsrc/databases/mariadb106-server/files/smf/mariadb.sh:1.2 pkgsrc/databases/mariadb106-server/files/smf/mariadb.sh:1.3
--- pkgsrc/databases/mariadb106-server/files/smf/mariadb.sh:1.2 Wed Apr 20 17:36:03 2022
+++ pkgsrc/databases/mariadb106-server/files/smf/mariadb.sh     Tue Mar  7 11:06:28 2023
@@ -1,6 +1,6 @@
 #!@SMF_METHOD_SHELL@
 #
-# $NetBSD: mariadb.sh,v 1.2 2022/04/20 17:36:03 tm Exp $
+# $NetBSD: mariadb.sh,v 1.3 2023/03/07 11:06:28 jperkin Exp $
 #
 # Init script for mysqld.
 #
@@ -13,6 +13,12 @@ ulimit -n 10240
 
 case "$1" in
 start)
+       if [ ! -d @MARIADB_DATADIR@/mysql ]; then
+               @LOCALBASE@/bin/mysql_install_db \
+                       --datadir=@MARIADB_DATADIR@ \
+                       --user=@MARIADB_USER@
+       fi
+
        @LOCALBASE@/sbin/mariadbd --user=@MARIADB_USER@ \
                --basedir=@LOCALBASE@ \
                --datadir=@MARIADB_DATADIR@ \