diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-02-08 12:42:42 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-02-08 12:42:42 +0000 |
| commit | 7f0c31cc65271d8bc7d49142634e8f9c0a5f8d32 (patch) | |
| tree | 2e2211802ed054177d76a4dfbe5c4f742dcdf559 /databases/mysql56-server/files | |
| parent | 845bd6e2d48d379289f2153f22200ed9e2637e49 (diff) | |
| download | ports-7f0c31cc65271d8bc7d49142634e8f9c0a5f8d32.tar.gz ports-7f0c31cc65271d8bc7d49142634e8f9c0a5f8d32.zip | |
databases/mysql56-server: Fix rc-script ${name}_limits conflict for post r328331
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
Notes
Notes:
svn path=/head/; revision=461217
Diffstat (limited to 'databases/mysql56-server/files')
| -rw-r--r-- | databases/mysql56-server/files/mysql-server.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in index 8c1a62cd41df..9996986e9451 100644 --- a/databases/mysql56-server/files/mysql-server.in +++ b/databases/mysql56-server/files/mysql-server.in @@ -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 |