diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-04-04 20:45:14 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-04-04 20:45:14 +0000 |
| commit | f5b82ad2e1c0be226a8de3f9cd38fc6947ff838c (patch) | |
| tree | 28736dae35973f5e54ae7ac3c7f52f4374e4b62d /databases/mysql56-server/files/mysql-server.in | |
| parent | - Update to 1.83 (diff) | |
databases/mysql56-server: Adapt ${name}_limits to the new mechanism
Regarding to the changes 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.
This however causes collision of variable names and also is not
compatible with the old mechanism.
This fixes the rc-script of mysql56 for the bases with both
old and new mechanism.
PR: 227229
Submitted by: 0mp
Reported by: 0mp
Sponsored by: Netzkommune GmbH
Diffstat (limited to 'databases/mysql56-server/files/mysql-server.in')
| -rw-r--r-- | databases/mysql56-server/files/mysql-server.in | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in index 9996986e9451..0cc37c69922f 100644 --- a/databases/mysql56-server/files/mysql-server.in +++ b/databases/mysql56-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%%" @@ -36,7 +36,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_confdir}/my.cnf" ]; then @@ -47,12 +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}" +%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -74,11 +71,12 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if [ -z "$mysql_limits" ] || 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() |