databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base
This is port of r461217
This commit is contained in:
parent
733b35d35e
commit
1a952ad776
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=461219
2 changed files with 5 additions and 1 deletions
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME?= mysql
|
||||
PORTVERSION= 8.0.2
|
||||
PORTREVISION?= 1
|
||||
DISTVERSIONSUFFIX?= -dmr
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= MYSQL/MySQL-8.0
|
||||
|
|
|
@ -47,6 +47,9 @@ fi
|
|||
if [ ! -z "${mysql_optfile}" ]; then
|
||||
mysql_extra="--defaults-extra-file=${mysql_optfile}"
|
||||
fi
|
||||
if [ "${mysql_limits}" = "NO" ]; then
|
||||
mysql_limits=""
|
||||
fi
|
||||
|
||||
mysql_user="mysql"
|
||||
mysql_limits_args="-e -U ${mysql_user}"
|
||||
|
@ -70,7 +73,7 @@ mysql_prestart()
|
|||
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
|
||||
mysql_create_auth_tables || return 1
|
||||
fi
|
||||
if checkyesno mysql_limits; then
|
||||
if [ -z "$mysql_limits" ] || checkyesno mysql_limits; then
|
||||
eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
|
||||
else
|
||||
return 0
|
||||
|
|
Loading…
Reference in a new issue