From efdbdee6a194ba85d8f25dd216a0047c35b566b6 Mon Sep 17 00:00:00 2001 From: William Hirigoyen Date: Mon, 29 Aug 2022 17:28:57 +0200 Subject: [PATCH] =?UTF-8?q?[generate-ldif]=C2=A0Make=20MariaDB=20version?= =?UTF-8?q?=20detection=20more=20generic.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate-ldif/templates/generateldif.sh.j2 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/generate-ldif/templates/generateldif.sh.j2 b/generate-ldif/templates/generateldif.sh.j2 index 17ff759a..229c1443 100755 --- a/generate-ldif/templates/generateldif.sh.j2 +++ b/generate-ldif/templates/generateldif.sh.j2 @@ -408,12 +408,8 @@ EOT fi # MariaDB -if is_pkg_installed mariadb-server-10.3; then - mariadb_version=$(get_pkg_version mariadb-server-10.3) -elif is_pkg_installed mariadb-server-10.1; then - mariadb_version=$(get_pkg_version mariadb-server-10.1) -elif is_pkg_installed mariadb-server-10.0; then - mariadb_version=$(get_pkg_version mariadb-server-10.0) +if is_pkg_installed mariadb-server; then + mariadb_version=$(get_pkg_version mariadb-server) fi if [ -n "${mariadb_version}" ]; then cat <> "${ldif_file}"