From 83ca1944f067cff8f12a269b8f29369a0a820faa Mon Sep 17 00:00:00 2001 From: Christopher Troup Date: Sat, 11 Feb 2017 13:20:28 -0500 Subject: [PATCH] Post Uninstall hooks for fedora based OS's Previously the `postun` hook would try and remove ProxySQL from chkconfig, but that would fail because the package was already uninstalled. Instead, we can do this in the `preun` hook, and ensure that ProxySQL is properly shutdown before doing cleanup tasks. --- docker/images/proxysql/centos5-build/proxysql.spec | 5 ++++- docker/images/proxysql/centos67-build/proxysql.spec | 5 ++++- docker/images/proxysql/centos7-build/proxysql.spec | 5 ++++- docker/images/proxysql/fedora24-build/proxysql.spec | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docker/images/proxysql/centos5-build/proxysql.spec b/docker/images/proxysql/centos5-build/proxysql.spec index 1770cd57b..16ff2cff5 100644 --- a/docker/images/proxysql/centos5-build/proxysql.spec +++ b/docker/images/proxysql/centos5-build/proxysql.spec @@ -39,9 +39,12 @@ rm -rf %{buildroot} mkdir /var/run/%{name} chkconfig --add %{name} +%preun +/etc/init.d/%{name} stop +chkconfig --del %{name} + %postun rm -rf /var/run/%{name} -chkconfig --del %{name} %files %defattr(-,root,root,-) diff --git a/docker/images/proxysql/centos67-build/proxysql.spec b/docker/images/proxysql/centos67-build/proxysql.spec index 1770cd57b..16ff2cff5 100644 --- a/docker/images/proxysql/centos67-build/proxysql.spec +++ b/docker/images/proxysql/centos67-build/proxysql.spec @@ -39,9 +39,12 @@ rm -rf %{buildroot} mkdir /var/run/%{name} chkconfig --add %{name} +%preun +/etc/init.d/%{name} stop +chkconfig --del %{name} + %postun rm -rf /var/run/%{name} -chkconfig --del %{name} %files %defattr(-,root,root,-) diff --git a/docker/images/proxysql/centos7-build/proxysql.spec b/docker/images/proxysql/centos7-build/proxysql.spec index 1770cd57b..16ff2cff5 100644 --- a/docker/images/proxysql/centos7-build/proxysql.spec +++ b/docker/images/proxysql/centos7-build/proxysql.spec @@ -39,9 +39,12 @@ rm -rf %{buildroot} mkdir /var/run/%{name} chkconfig --add %{name} +%preun +/etc/init.d/%{name} stop +chkconfig --del %{name} + %postun rm -rf /var/run/%{name} -chkconfig --del %{name} %files %defattr(-,root,root,-) diff --git a/docker/images/proxysql/fedora24-build/proxysql.spec b/docker/images/proxysql/fedora24-build/proxysql.spec index 1770cd57b..16ff2cff5 100644 --- a/docker/images/proxysql/fedora24-build/proxysql.spec +++ b/docker/images/proxysql/fedora24-build/proxysql.spec @@ -39,9 +39,12 @@ rm -rf %{buildroot} mkdir /var/run/%{name} chkconfig --add %{name} +%preun +/etc/init.d/%{name} stop +chkconfig --del %{name} + %postun rm -rf /var/run/%{name} -chkconfig --del %{name} %files %defattr(-,root,root,-)