Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
2018-05-09 15:54:59 +02:00

View File

@ -20,7 +20,7 @@ then
sqlFile=$(mktemp -p /root) sqlFile=$(mktemp -p /root)
password=$(pwgen -1 10) password=$(pwgen -1 10)
/usr/share/eole/sbin/mariaPwd ${password} /usr/share/eole/sbin/mariadbPwd ${password}
accounts=($(CreoleGet accName)) accounts=($(CreoleGet accName))
limits="$(CreoleGet accLimitTarget '')" limits="$(CreoleGet accLimitTarget '')"