update

midoks · Jul 3, 2024 · a11e43f · a11e43f
1 parent b76a9bf
commit a11e43f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py
@@ -1511,8 +1511,8 @@ def resetDbRootPwd(version):
     pwd = mw.getRandomString(16)
 
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
-
-    if float(version) < 5.7:
+    mdb8 = getMdb8Ver()
+    if not mw.inArray(mdb8, version):
         cmd_pass = serverdir + '/bin/usr/bin/mysql --defaults-file=' + myconf + ' -uroot -e'
         cmd_pass = cmd_pass + '"UPDATE mysql.user SET password=PASSWORD(\'' + pwd + "') WHERE user='root';"
         cmd_pass = cmd_pass + 'flush privileges;"'

diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
@@ -1501,7 +1501,8 @@ def resetDbRootPwd(version):
 
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
 
-    if float(version) < 5.7:
+    mdb8 = getMdb8Ver()
+    if not mw.inArray(mdb8, version):
         cmd_pass = serverdir + '/bin/usr/bin/mysql --defaults-file=' + myconf + ' -uroot -e'
         cmd_pass = cmd_pass + '"UPDATE mysql.user SET password=PASSWORD(\'' + pwd + "') WHERE user='root';"
         cmd_pass = cmd_pass + 'flush privileges;"'

diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
@@ -1721,7 +1721,8 @@ def resetDbRootPwd(version):
 
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
 
-    if float(version) < 5.7:
+    mdb8 = getMdb8Ver()
+    if not mw.inArray(mdb8, version):
         cmd_pass = serverdir + '/bin/mysql --defaults-file=' + myconf + ' -uroot -e'
         cmd_pass = cmd_pass + '"UPDATE mysql.user SET password=PASSWORD(\'' + pwd + "') WHERE user='root';"
         cmd_pass = cmd_pass + 'flush privileges;"'