From 1bcca1b3b5b2db484f189eba225d00b525d0e44e Mon Sep 17 00:00:00 2001 From: Ben Konick Date: Thu, 9 Jan 2025 12:02:28 -0500 Subject: [PATCH 1/2] Make mysql_systemd_start_pre and mysql_systemd helper compatible with Amazon Linux 2023 Signed-off-by: Ben Konick --- CHANGELOG.md | 2 ++ libraries/helpers.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d621ceda..d7c1606a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## Unreleased +- Make `mysql_systemd_start_pre` and `mysql_systemd` helper compatible with Amazon Linux 2023 + ## 11.1.9 - *2024-12-09* ## 11.1.8 - *2024-11-18* diff --git a/libraries/helpers.rb b/libraries/helpers.rb index ad96fee6..01d124c1 100644 --- a/libraries/helpers.rb +++ b/libraries/helpers.rb @@ -295,7 +295,7 @@ def mysqld_bin end def mysql_systemd_start_pre - return '/usr/bin/mysqld_pre_systemd' if v57plus && (el7? || el8? || fedora?) + return '/usr/bin/mysqld_pre_systemd' if v57plus && (amazon? || el7? || el8? || fedora?) return '/usr/bin/mysql-systemd-start pre' if platform_family?('rhel') return '/usr/lib/mysql/mysql-systemd-helper install' if suse? '/usr/share/mysql/mysql-systemd-start pre' @@ -303,6 +303,7 @@ def mysql_systemd_start_pre def mysql_systemd return "/usr/libexec/#{mysql_name}-wait-ready $MAINPID" if v57plus && (el7? || el8? || fedora?) + return '' if platform_family?('amazon') && platform_version.to_i == 2023 return '/usr/bin/mysql-systemd-start' if platform_family?('rhel') return '/usr/share/mysql/mysql-systemd-start' if v57plus "/usr/libexec/#{mysql_name}-wait-ready $MAINPID" From 33f0b4820f505139bc9ba5327b8a04595873d88c Mon Sep 17 00:00:00 2001 From: Ben Konick Date: Thu, 9 Jan 2025 12:04:35 -0500 Subject: [PATCH 2/2] Make mysql_systemd_start_pre and mysql_systemd helper compatible with Amazon Linux 2023 Signed-off-by: Ben Konick --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7c1606a..b145bfb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. ## Unreleased -- Make `mysql_systemd_start_pre` and `mysql_systemd` helper compatible with Amazon Linux 2023 +- Make `mysql_systemd_start_pre` and `mysql_systemd` helpers compatible with Amazon Linux 2023 ## 11.1.9 - *2024-12-09*