commit 0b79f6f7690773701a37921f626782e528fa9c36
author Dr. Jens Harbott <harbott@osism.tech> Tue Jul 04 07:18:01 2023 +0200
committer Dr. Jens Harbott <frickler@offenerstapel.de> Wed Aug 02 05:11:03 2023 +0000
tree ba2e694c2423a919ae82157c3852133992575b96
parent a40f9cb91fbedddec89f0ffd6c7dd4b3828a232e

Add debian-bookworm job

Change-Id: Id5e54775e2be38a75db0bd1f55d1d3b5ae7ef71f

lib/databases/mysql

diff --git a/lib/databases/mysql b/lib/databases/mysql
index 27d1ec6..e069e12 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -20,7 +20,7 @@
     MYSQL_SERVICE_NAME=mysql
     if is_fedora && ! is_oraclelinux; then
         MYSQL_SERVICE_NAME=mariadb
-    elif [[ "$DISTRO" == "bullseye" ]]; then
+    elif [[ "$DISTRO" =~ bookworm|bullseye ]]; then
         MYSQL_SERVICE_NAME=mariadb
     fi
 fi
@@ -122,7 +122,8 @@
     # In mariadb e.g. on Ubuntu socket plugin is used for authentication
     # as root so it works only as sudo. To restore old "mysql like" behaviour,
     # we need to change auth plugin for root user
-    if is_ubuntu && [[ "$DISTRO" != "bullseye" ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]; then
+    # TODO(frickler): simplify this logic
+    if is_ubuntu && [[ ! "$DISTRO" =~ bookworm|bullseye ]] && [ "$MYSQL_SERVICE_NAME" == "mariadb" ]; then
         if [[ "$DISTRO" == "jammy" ]]; then
             # For Ubuntu 22.04 (jammy) we follow the model outlined in
             # https://mariadb.org/authentication-in-mariadb-10-4/