Attachment 217213 Details for Bug 247413 – add MARIADB_GROUP to SUB_LIST and create rundir before starting the server

[patch] add MARIADB_GROUP to SUB_LIST and create rundir before starting the server

patch-mariadb104-server-Makefile-and-mysql-server (text/plain), 1.92 KB, created by Georg Altmann on 2020-08-14 16:35:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Georg Altmann

Created: 2020-08-14 16:35:57 UTC

Size: 1.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile    (revision 544887)
>+++ Makefile    (working copy)
>@@ -123,6 +123,7 @@
> GSSAPI_NONE_CMAKE_ON=  -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
> OPTIONS_SUB=           yes
> SUB_LIST+=             MARIADB_USER="${MARIADB_USER}" \
>+                       MARIADB_GROUP="${MARIADB_GROUP}" \
>                        MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
>                        MARIADB_SOCK="${MARIADB_SOCK}"
> PLIST_SUB+=            MARIADB_USER="${MARIADB_USER}" \
>Index: files/mysql-server.in
>===================================================================
>--- files/mysql-server.in       (revision 544887)
>+++ files/mysql-server.in       (working copy)
>@@ -38,6 +38,7 @@
> : ${mysql_enable="NO"}
> %%LEGACY_LIMITS%%: ${mysql_limits="NO"}
> : ${mysql_user="%%MARIADB_USER%%"}
>+: ${mysql_group="%%MARIADB_GROUP%%"}
> %%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
> : ${mysql_dbdir="/var/db/mysql"}
> : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
>@@ -120,14 +121,14 @@
>                        return 1
>                fi
>        done
>+       [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
>+       if [ ! -d "${mysql_rundir}" ]; then
>+               install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}" ||
>+                       return 1
>+       fi
>        if [ ! -d "${mysql_dbdir}/mysql/." ]; then
>                mysql_create_auth_tables || return 1
>        fi
>-       [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
>-       if [ ! -d "${mysql_rundir}" ]; then
>-               install -d -o ${mysql_user} -g %%MARIADB_GROUP%% "${mysql_rundir}"
>-
>-       fi
> %%LEGACY_LIMITS%%      if checkyesno mysql_limits; then
> %%LEGACY_LIMITS%%              eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
> %%LEGACY_LIMITS%%      else

Actions: View | Diff

Attachments on bug 247413: 215774 | 217213 | 217225 | 218855