Fix mysql-prepare-db-dir

Resolves: #1335849
This commit is contained in:
Jakub Dorňák 2016-05-26 16:16:11 +02:00
parent 992cadbef3
commit f4d4f22e9c
2 changed files with 7 additions and 3 deletions

View File

@ -123,7 +123,7 @@
Name: mariadb
Version: %{compatver}.%{bugfixver}
Release: 1%{?with_debug:.debug}%{?dist}
Release: 2%{?with_debug:.debug}%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@ -1284,6 +1284,10 @@ fi
%endif
%changelog
* Thu May 26 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-2
- Fix mysql-prepare-db-dir
Resolves: #1335849
* Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-1
- Add selinux policy
- Update to 10.1.14 (includes various bug fixes)

View File

@ -55,8 +55,8 @@ chown "$myuser:$mygroup" "$errlogfile"
chmod 0640 "$errlogfile"
[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
# Make the data directory
if [ ! -d "$datadir/mysql" ] ; then
# Make the data directory if doesn't exist or empty
if ! ls $datadir/* &>/dev/null; then
# First, make sure $datadir is there with correct permissions
# (note: if it's not, and we're not root, this'll fail ...)
if [ ! -e "$datadir" -a ! -h "$datadir" ]