diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/mariadb/doinst.sh | 7 | ||||
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/ap/mariadb/doinst.sh b/source/ap/mariadb/doinst.sh index 12bad9bb9..b106e2fed 100644 --- a/source/ap/mariadb/doinst.sh +++ b/source/ap/mariadb/doinst.sh @@ -28,8 +28,9 @@ config etc/my.cnf.d/server.cnf.new config etc/my.cnf.d/spider.cnf.new config etc/logrotate.d/mysql.new -# Not supported in every $ARCH: -if [ -r etc/my.cnf.d/tokudb.cnf.new ]; then - config etc/my.cnf.d/tokudb.cnf.new +# This one is only comments, so remove it if it's left behind: +if [ -r etc/security/user_map.conf.new ]; then + config etc/security/user_map.conf.new fi +rm -f etc/security/user_map.conf.new diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index bfbff136b..a35a90384 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. @@ -208,8 +208,9 @@ install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new # Mark config files under /etc as .new mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new +mv $PKG/etc/security/user_map.conf $PKG/etc/security/user_map.conf.new mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.new -for i in client mysql-clients s3 server spider tokudb; do +for i in client mysql-clients s3 server spider ; do mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new done |