Merge branch 'develop' into dist/eole/2.7.0/develop

2019-03-01 15:36:10 +01:00 · 2019-03-01 15:36:10 +01:00 · 2ba4b56d51
commit 2ba4b56d51
parent 065308a921 921e6b01a1
1 changed files with 1 additions and 1 deletions
--- a/posttemplate/25-mariadb-passwd
+++ b/posttemplate/25-mariadb-passwd
@ -14,7 +14,7 @@ if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
 else
    pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
    if [ ! -d "$mariadb_cfdir" ]; then
-      then install -o 0 -g 0 -m 0755 -d $mariadb_cfdir
+      install -o 0 -g 0 -m 0755 -d $mariadb_cfdir
    fi
    umask 066
    cat /dev/null > $dc