diff options
| author | mmokhi <mmokhi@FreeBSD.org> | 2018-02-08 20:45:25 +0800 |
|---|---|---|
| committer | mmokhi <mmokhi@FreeBSD.org> | 2018-02-08 20:45:25 +0800 |
| commit | 9c8eea591490da8cf9daf1f534465193c83d087f (patch) | |
| tree | 74d8a48045b7780288fbdf43df3c64b38c3f2bd6 /databases | |
| parent | fc8b33393ccf30a439199b87393e4e357a1c966d (diff) | |
| download | freebsd-ports-gnome-9c8eea591490da8cf9daf1f534465193c83d087f.tar.gz freebsd-ports-gnome-9c8eea591490da8cf9daf1f534465193c83d087f.tar.zst freebsd-ports-gnome-9c8eea591490da8cf9daf1f534465193c83d087f.zip | |
databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base
This is port of r461217
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql57-server/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql57-server/files/mysql-server.in | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index ab3d0c75667e..a9399568005a 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -3,6 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.21 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in index cafd13f414aa..d33cd12c2a5c 100644 --- a/databases/mysql57-server/files/mysql-server.in +++ b/databases/mysql57-server/files/mysql-server.in @@ -47,6 +47,10 @@ 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 +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 |