From b1f2269b58710a3e35a7ba5ef3e9fc8fc5b4aaa0 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 24 Jun 2020 12:38:44 +0200
Subject: [PATCH] install_mysql.sh: configure authentication for user root for
 both, 'unix_socket' (without password) and mysql_native_password.

---
 install_mysql.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_mysql.sh b/install_mysql.sh
index b46d4c8..f603ef0 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -5736,9 +5736,9 @@ if ! $UPDATE_MYSQL ; then
 		echo "" >> ${logdir}/main.log
 		echo "## - Setze root Passwort für den MariaDB Zugang" >> ${logdir}/main.log
 		echo "## -" >> ${logdir}/main.log
-		echo "${MYSQL_INSTALL_DIR}/bin/mysql -S $MYSQL_UNIX_SOCKET -uroot mysql -N -s -e \"ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD('$MYSQL_ROOT_PW')\"" >> ${logdir}/main.log
+		echo "${MYSQL_INSTALL_DIR}/bin/mysql -S $MYSQL_UNIX_SOCKET -uroot mysql -N -s -e \"ALTER USER root@localhost IDENTIFIED VIA unix_socket OR mysql_native_password USING PASSWORD('$MYSQL_ROOT_PW')\"" >> ${logdir}/main.log
 
-		${MYSQL_INSTALL_DIR}/bin/mysql -S $MYSQL_UNIX_SOCKET -uroot mysql -N -s -e "ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD('$MYSQL_ROOT_PW')" \
+		${MYSQL_INSTALL_DIR}/bin/mysql -S $MYSQL_UNIX_SOCKET -uroot mysql -N -s -e "ALTER USER root@localhost IDENTIFIED VIA unix_socket OR mysql_native_password USING PASSWORD('$MYSQL_ROOT_PW')" \
 			>> ${logdir}/main.log 2>&1
 		if [ "$?" = "0" ]; then
 			echo_ok