diff options
| author | nia <nia@pkgsrc.org> | 2021-05-11 17:26:50 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-05-11 17:26:50 +0000 |
| commit | cbb993d1ed561d0cfbeae9f85b91b13cd2307b99 (patch) | |
| tree | e244f7c728d2f909182302f0b8e73adfe6c93426 /databases | |
| parent | 595e7126bbc4d576edcd27b60fbb1e3dbe59940b (diff) | |
| download | pkgsrc-cbb993d1ed561d0cfbeae9f85b91b13cd2307b99.tar.gz | |
mariadb104-server: do initdb automatically on start
suggested by abs
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb104-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/mariadb.sh | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 32ce328b5d6..03246ac4094 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -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]* diff --git a/databases/mariadb104-server/files/mariadb.sh b/databases/mariadb104-server/files/mariadb.sh index 93c3b319dad..2cf16bd0eac 100644 --- a/databases/mariadb104-server/files/mariadb.sh +++ b/databases/mariadb104-server/files/mariadb.sh @@ -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 } |