Skip to content

Commit f860e79

Browse files
committed
Add additional mysql checks for debian release 9.
1 parent 7d88960 commit f860e79

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

install/hst-install-debian.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,11 +1068,21 @@ if [ "$mysql" = 'yes' ]; then
10681068
mysqladmin -u root password $mpass
10691069
echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf
10701070
chmod 600 /root/.my.cnf
1071-
mysql -e "DELETE FROM mysql.user WHERE User=''"
1072-
mysql -e "DROP DATABASE test" >/dev/null 2>&1
1073-
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1074-
mysql -e "DELETE FROM mysql.user WHERE user='' or password='';"
1075-
mysql -e "FLUSH PRIVILEGES"
1071+
if [ "$release" = '8' ]; then
1072+
mysql -e "DELETE FROM mysql.user WHERE User=''"
1073+
mysql -e "DROP DATABASE test" >/dev/null 2>&1
1074+
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1075+
mysql -e "DELETE FROM mysql.user WHERE user='' or password='';"
1076+
mysql -e "FLUSH PRIVILEGES"
1077+
fi
1078+
if [ "$release" = '9' ]; then
1079+
mysql -e "DELETE FROM mysql.user WHERE User=''"
1080+
mysql -e "DROP DATABASE test" >/dev/null 2>&1
1081+
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1082+
mysql -e "DELETE FROM mysql.user WHERE user='';"
1083+
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$mpass';"
1084+
mysql -e "FLUSH PRIVILEGES"
1085+
fi
10761086

10771087
# Configuring phpMyAdmin
10781088
if [ "$apache" = 'yes' ]; then

0 commit comments

Comments
 (0)