MDEV-14560 Extra engines enabled through additional config are not lo…

…aded on first installation Use RedHat-recommended /var/lib/rpm-state/mariadb/ for restart flag. This also fixes SUSE where /var/lib/rpm-state doesn't necessarily exist.
MariaDB · Sep 21, 2018 · 61a6f4b · 61a6f4b
1 parent e7d1522
commit 61a6f4b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
@@ -81,7 +81,8 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "
 %define _bindir     ${INSTALL_BINDIRABS}
 %define _sbindir    ${INSTALL_SBINDIRABS}
 %define _sysconfdir ${INSTALL_SYSCONFDIR}
-%define restart_flag %{_localstatedir}/lib/rpm-state/mariadb-restart
+%define restart_flag_dir %{_localstatedir}/lib/rpm-state/mariadb
+%define restart_flag %{restart_flag_dir}/need-restart
 ")
 
 # this creative hack is described here: http://www.cmake.org/pipermail/cmake/2012-January/048416.html

diff --git a/support-files/rpm/plugin-postin.sh b/support-files/rpm/plugin-postin.sh
@@ -1,2 +1,3 @@
 # request the server restart
+mkdir -p %{restart_flag_dir}
 echo > %{restart_flag}
diff --git a/support-files/rpm/server-postun.sh b/support-files/rpm/server-postun.sh
@@ -1,5 +1,6 @@
 if [ $1 -ge 1 ]; then
   # request the server restart
+  mkdir -p %{restart_flag_dir}
   echo > %{restart_flag}
 fi