ef4ddb08245f80a35f424650c4ee5c2ecca62419
max
  Thu Feb 24 03:38:35 2022 -0800
hopefully the last fix for centos8 stream mysql setup, refs #28733

diff --git src/product/installer/browserSetup.sh src/product/installer/browserSetup.sh
index 6dac18f..daf8ddc 100755
--- src/product/installer/browserSetup.sh
+++ src/product/installer/browserSetup.sh
@@ -497,36 +497,38 @@
       $SEDINPLACE 's/^#showTableCache=/showTableCache=/g' $APACHEDIR/cgi-bin/hg.conf
 }
 
 # wait for a key press
 function waitKey ()
 {
     echo2
     echo2 Press any key to continue or CTRL-C to abort.
     read -n 1
     echo2
 }
 
 # set MYCNF to the path to my.cnf
 function setMYCNF ()
 {
-    if [ -f /etc/my.cnf ] ; then
+    if [ -f /etc/my.cnf.d/mariadb-server.cnf ] ; then
+	# Centos 8 stream: This has to be first, because /etc/my.cnf exists on Centos 8 Stream, but it contains a mysqld section
+        # by default and somehow the section doesn't seem to take effect since a specific [mariadb] section also exists in the mariadb-server.cnf.
+        # As a result, we only modify the mariadb-server config file
+    	MYCNF=/etc/my.cnf.d/mariadb-server.cnf 
+    elif [ -f /etc/my.cnf ] ; then
 	# Centos 6-8
     	MYCNF=/etc/my.cnf
-    elif [ -f /etc/my.cnf.d/mariadb-server.cnf ] ; then
-	# Centos 8 stream
-    	MYCNF=/etc/my.cnf.d/mariadb-server.cnf 
     elif [ -f /etc/mysql/my.cnf ] ; then
         # Ubuntu 14
     	MYCNF=/etc/mysql/my.cnf
     elif [ -f /etc/mysql/mysql.conf.d/mysqld.cnf ] ; then
 	# Ubuntu 16, 18, 20
     	MYCNF=/etc/mysql/mysql.conf.d/mysqld.cnf
     else
     	echo Could not find my.cnf. Adapt 'setMYCNF()' in browserSetup.sh and/or contact us.
     	exit 1
     fi
     echo Found Mariadb config file: $MYCNF
 }
 
 function mysqlAllowOldPasswords
 # mysql >= 8 does not allow the old passwords anymore. But our client is still compiled