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

pretemplate/25-bdd-init

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 #
 # Initialize root password
 # and secure MariaDB installation
@@ -11,22 +10,20 @@ function genPasswordToFile()
         pwgen -1 10 > ${file}
         chmod 600 ${file}
 }
-
 ROLE=$(CreoleGet dbClusterPosition)
 WRITERFILE="/root/.bddadm"
 SECURE_CMD="mysql_secure_installation"
+oldPass=""
 
-[[ ${ROLE} == "Node" ]] && exit 0
-[[ -e ${WRITERFILE} ]] && exit 0
-
+#[[ ${ROLE} == "Node" ]] && exit 0
+[[ -e ${WRITERFILE} ]] && oldPass=$(< ${WRITERFILE})
 
 genPasswordToFile ${WRITERFILE}
-
 pass=$(< ${WRITERFILE})
 
 # Run secure installation script
 ${SECURE_CMD} <<__EOF__
-
+${oldPass}
 y
 ${pass}
 ${pass}