diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2018-11-02 13:20:45 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2018-11-02 13:20:45 +0000 |
| commit | f60d4bacdc58ec061406d72cace1ac1266952e39 (patch) | |
| tree | bfa25a2e626db5eb6ca7d2313a56bd6e3147b2de /databases/percona57-server/files/mysql-server.in | |
| parent | net/reaver: Pass the port to the new maintainer (diff) | |
databases/percona57-server: Adapt ${name}_limits to the new resource
limiting mechanics for services
Thanks to the recent change to rc.subr(8) it is no longer necessary to
define a resource limiting logic in service scripts. limits(1) is now run
by default and its configuration is handled via the "${name}_limits"
variable.
Unfortunately, there is a collision of variable names. The service scripts
are broken on FreeBSD version with that new change (>= 12.0).
The patch preserves the old behavior on the systems without the rc.subr(8)
modification.
PR: 227236
Reviewed by: krion
Approved by: krion (mentor), maintainer timeout
Differential Revision: https://reviews.freebsd.org/D17786
Notes
Notes:
svn path=/head/; revision=483806
Diffstat (limited to 'databases/percona57-server/files/mysql-server.in')
| -rw-r--r-- | databases/percona57-server/files/mysql-server.in | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/databases/percona57-server/files/mysql-server.in b/databases/percona57-server/files/mysql-server.in index 719583c8c845..5c6041ffaa90 100644 --- a/databases/percona57-server/files/mysql-server.in +++ b/databases/percona57-server/files/mysql-server.in @@ -11,9 +11,9 @@ # Add the following line to /etc/rc.conf to enable mysql: # mysql_enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. +%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# just before mysql starts. # mysql_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. # mysql_confdir (str): Default to "%%ETCDIR%%" @@ -34,7 +34,7 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -: ${mysql_limits="NO"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="%%MY_DBDIR%%"} : ${mysql_confdir="%%ETCDIR%%"} if [ -f "${mysql_dbdir}/my.cnf" ]; then @@ -44,7 +44,7 @@ else fi mysql_user="mysql" -mysql_limits_args="-e -U ${mysql_user}" +%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -76,11 +76,12 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql" ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } mysql_poststart() |