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

This commit is contained in:
Philippe Caseiro 2018-05-09 17:07:35 +02:00
commit 61383bb17a
1 changed files with 10 additions and 2 deletions

View File

@ -20,6 +20,7 @@ logfile="${logdir}/maria-init.log"
if [[ ${ROLE} == "Leader" ]] if [[ ${ROLE} == "Leader" ]]
then then
service mysql start
${passwd} ${PASSWORD} ${passwd} ${PASSWORD}
# Run secure installation script # Run secure installation script
@ -32,8 +33,15 @@ y
y y
y y
__EOF__ __EOF__
touch ${INITDONE} if [[ ${?} -eq 0 ]]
exit ${?} then
service mysql stop
touch ${INITDONE}
exit ${?}
else
service mysql stop
exit ${?}
fi
else else
exit 0 exit 0
fi fi