fixes for systemd - remove .pid files after shutting down servers

fixes for systemd - remove .pid files after shutting down servers
Ticket #263 - add systemd include directive
Ticket #264 - upgrade needs better check for "server is running"
(cherry picked from commit 7dfddf14e3e83bc1ad68c3fd1182344f60b4a132)
This commit is contained in:
Rich Megginson 2012-01-23 15:50:59 -07:00
parent 5f42e703e4
commit 78f687425c
2 changed files with 10 additions and 2 deletions

View File

@ -19,7 +19,7 @@
Summary: 389 Directory Server (base) Summary: 389 Directory Server (base)
Name: 389-ds-base Name: 389-ds-base
Version: 1.2.10 Version: 1.2.10
Release: %{?relprefix}7%{?prerel}%{?dist} Release: %{?relprefix}8%{?prerel}%{?dist}
License: GPLv2 with exceptions License: GPLv2 with exceptions
URL: http://port389.org/ URL: http://port389.org/
Group: System Environment/Daemons Group: System Environment/Daemons
@ -228,6 +228,8 @@ fi
# shutdown all instances # shutdown all instances
echo shutting down all instances . . . > $output 2>&1 || : echo shutting down all instances . . . > $output 2>&1 || :
/bin/systemctl stop %{groupname} > $output 2>&1 || : /bin/systemctl stop %{groupname} > $output 2>&1 || :
echo remove pid files . . . > $output 2>&1 || :
/bin/rm -f /var/run/%{pkgname}*.pid /var/run/%{pkgname}*.startpid
# do the upgrade # do the upgrade
echo upgrading instances . . . > $output 2>&1 || : echo upgrading instances . . . > $output 2>&1 || :
%{_sbindir}/setup-ds.pl -l $output -u -s General.UpdateMode=offline > $output 2>&1 || : %{_sbindir}/setup-ds.pl -l $output -u -s General.UpdateMode=offline > $output 2>&1 || :
@ -253,6 +255,7 @@ exit 0
%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf %config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig %config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname} %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}.systemd
%{_datadir}/%{pkgname} %{_datadir}/%{pkgname}
%{_unitdir} %{_unitdir}
%{_bindir}/* %{_bindir}/*
@ -281,6 +284,11 @@ exit 0
%{_libdir}/%{pkgname}/libslapd.so.* %{_libdir}/%{pkgname}/libslapd.so.*
%changelog %changelog
* Mon Jan 23 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.8.a7
- fixes for systemd - remove .pid files after shutting down servers
- Ticket #263 - add systemd include directive
- Ticket #264 - upgrade needs better check for "server is running"
* Fri Jan 20 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.7.a7 * Fri Jan 20 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10-0.7.a7
- Ticket #262 - pid file not removed with systemd - Ticket #262 - pid file not removed with systemd
- Ticket #50 - server should not call a plugin after the plugin close function is called - Ticket #50 - server should not call a plugin after the plugin close function is called

View File

@ -1 +1 @@
162736c08297f42bfbf89424c168f342 389-ds-base-1.2.10.a7.tar.bz2 06968adde45dcae518401709ef82510a 389-ds-base-1.2.10.a7.tar.bz2