Skip to content

Commit cb0d6dd

Browse files
committed
fix rpm upgrade tests after MDEV-37726
MDEV-37726 moved wsrep-start-position to INSTALL_RUNDATADIR and made the latter to be created by systemd-tmpfiles. Now postin scriptlet has to run systemd-tmpfiles explicitly to make sure INSTALL_RUNDATADIR exists before restarting the server. followup for 649216e
1 parent 9dce783 commit cb0d6dd

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

support-files/rpm/server-postin.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
if [ -f /usr/lib/systemd/system/mariadb.service -a -x /usr/bin/systemctl ]; then
22
systemd_conf=/etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
3+
systemd-tmpfiles --create mariadb.conf
34
if [ -x %{_bindir}/mariadb-service-convert -a ! -f "${systemd_conf}" ]; then
45
# Either fresh install or upgrade non-systemd -> systemd
56
mkdir -p /etc/systemd/system/mariadb.service.d

support-files/rpm/server-posttrans.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ if [ -r %{restart_flag} ] ; then
33
# only restart the server if it was already running
44
if [ -x /usr/bin/systemctl ] ; then
55
/usr/bin/systemctl daemon-reload > /dev/null 2>&1
6-
if /usr/bin/systemctl is-active mysql; then
6+
if /usr/bin/systemctl -q is-active mysql; then
77
/usr/bin/systemctl restart mysql > /dev/null 2>&1
88
else
99
/usr/bin/systemctl try-restart mariadb.service > /dev/null 2>&1

0 commit comments

Comments
 (0)