kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/mysql56-server: Fix rc-script ${name}_limits conflict for post r328331

Browse source 
After r328331 changes in head/etc/rc.subr, having "NO" in mysql_limits
goes into "limits" command params as is.
So this patch substitutes the "NO" appropriately when needed.

PR:		225657
Reported by:	robbak@gmail.com
Reviewed by:	Rainer Hurling <rhurlin@gwdg.de>
Sponsored by:	Netzkommune GmbH
This commit is contained in:
Mahdi Mokhtari 2018-02-08 12:42:42 +00:00
parent 845bd6e2d4
commit 7f0c31cc65
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461217
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/mysql56-server/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.6.39
PORTREVISION?= 1
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server

5
databases/mysql56-server/files/mysql-server.in
View file

@ -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}"
@ -71,7 +74,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