CVS commit: pkgsrc/databases/mariadb104-server

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 11 17:26:51 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb104-server: Makefile
        pkgsrc/databases/mariadb104-server/files: mariadb.sh

Log Message:
mariadb104-server: do initdb automatically on start

suggested by abs


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb104-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb104-server/files/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/Makefile
diff -u pkgsrc/databases/mariadb104-server/Makefile:1.2 pkgsrc/databases/mariadb104-server/Makefile:1.3
--- pkgsrc/databases/mariadb104-server/Makefile:1.2     Mon May 10 14:15:55 2021
+++ pkgsrc/databases/mariadb104-server/Makefile Tue May 11 17:26:50 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2021/05/10 14:15:55 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/11 17:26:50 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       MariaDB 10.4, a free SQL database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb104-server/files/mariadb.sh
diff -u pkgsrc/databases/mariadb104-server/files/mariadb.sh:1.1 pkgsrc/databases/mariadb104-server/files/mariadb.sh:1.2
--- pkgsrc/databases/mariadb104-server/files/mariadb.sh:1.1     Sat May  8 19:47:16 2021
+++ pkgsrc/databases/mariadb104-server/files/mariadb.sh Tue May 11 17:26:50 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mariadb.sh,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+# $NetBSD: mariadb.sh,v 1.2 2021/05/11 17:26:50 nia Exp $
 #
 # PROVIDE: mariadb mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -26,7 +26,7 @@ start_precmd="mariadb_prestart"
 pidfile="@VARBASE@/run/mariadb/mariadb.pid"
 
 mariadb_initdb() {
-        if [ -f @MARIADB_DATADIR@/mysql/host.frm ]; then
+        if [ -f @MARIADB_DATADIR@/mysql/user.frm ]; then
                 echo "The MariaDB database has already been initialized."
                 echo "Skipping database initialization."
         else
@@ -43,6 +43,9 @@ mariadb_initdb() {
 }
 
 mariadb_prestart() {
+       if ! [ -f @MARIADB_DATADIR@/mysql/user.frm ]; then
+               mariadb_initdb
+       fi
        ulimit -n 4096
 }