rpms/ipa
7
0
Fork 0
Code Issues Pull Requests Releases Activity

upgrade: do not run sysv to systemd upgrade anymore

Browse Source
This commit is contained in:
Alexander Bokovoy 2013-08-14 14:29:52 +03:00
parent 8a7e6ad5ed
commit 2e523789e0
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freeipa.spec
View File

@ -8,7 +8,7 @@
Name: freeipa Name: freeipa
Version: 3.3.0 Version: 3.3.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Identity, Policy and Audit system Summary: The Identity, Policy and Audit system
Group: System Environment/Base Group: System Environment/Base
@ -482,10 +482,6 @@ install -m 644 init/systemd/ipa.service %{buildroot}%{_unitdir}/ipa.service
install -m 644 init/systemd/ipa_memcached.service %{buildroot}%{_unitdir}/ipa_memcached.service install -m 644 init/systemd/ipa_memcached.service %{buildroot}%{_unitdir}/ipa_memcached.service
# END # END
# Fedora spec file only: START
mkdir -p %{buildroot}%{_libexecdir}
install -m 755 init/systemd/freeipa-systemd-upgrade %{buildroot}%{_libexecdir}/freeipa-systemd-upgrade
# Fedora spec file only: END
mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
%endif # ! %{ONLY_CLIENT} %endif # ! %{ONLY_CLIENT}
@ -518,14 +514,6 @@ rm -rf %{buildroot}
/bin/systemctl --system daemon-reload 2>&1 || : /bin/systemctl --system daemon-reload 2>&1 || :
# END # END
if [ $1 -gt 1 ] ; then if [ $1 -gt 1 ] ; then
# Fedora spec file only: START
# When upgrade is performed from SysV to systemd, ipa.service will be inactive
# due to https://bugzilla.redhat.com/show_bug.cgi?id=752846
# FreeIPA existing setup cannot be used without upgrade script
# Note also it is now safe to run this script against working FreeIPA install
# after it has been migrated to systemd setup
/usr/libexec/freeipa-systemd-upgrade || :
# Fedora spec file only: END
/bin/systemctl condrestart certmonger.service 2>&1 || : /bin/systemctl condrestart certmonger.service 2>&1 || :
fi fi
@ -669,9 +657,6 @@ fi
%config %{_sysconfdir}/tmpfiles.d/ipa.conf %config %{_sysconfdir}/tmpfiles.d/ipa.conf
%attr(644,root,root) %{_unitdir}/ipa.service %attr(644,root,root) %{_unitdir}/ipa.service
%attr(644,root,root) %{_unitdir}/ipa_memcached.service %attr(644,root,root) %{_unitdir}/ipa_memcached.service
# Fedora spec file only: START
%{_libexecdir}/freeipa-systemd-upgrade
# Fedora spec file only: END
# END # END
%attr(644,root,root) %{_unitdir}/ipa-otpd.socket %attr(644,root,root) %{_unitdir}/ipa-otpd.socket
%attr(644,root,root) %{_unitdir}/ipa-otpd@.service %attr(644,root,root) %{_unitdir}/ipa-otpd@.service
@ -899,6 +884,10 @@ fi
%endif # ! %{ONLY_CLIENT} %endif # ! %{ONLY_CLIENT}
%changelog %changelog
* Wed Aug 14 2013 Alexander Bokovoy <abokovoy@redhat.com> - 3.3.0-2
- Remove freeipa-systemd-upgrade as non-systemd installs are not supported
anymore by Fedora project
* Wed Aug 7 2013 Martin Kosek <mkosek@redhat.com> - 3.3.0-1 * Wed Aug 7 2013 Martin Kosek <mkosek@redhat.com> - 3.3.0-1
- Update to upstream 3.3.0 - Update to upstream 3.3.0