Browse code
Added logic to reload services in case of rpm upgrade
Change-Id: Iea4a6b12408240bb58b5d3b83c852f5fc929f2e7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1629
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
dthaluru authored on 2016/11/04 06:14:55Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,39 @@ |
| 0 |
+--- a/src/core/macros.systemd.in 2016-11-03 13:04:12.219086800 -0700 |
|
| 1 |
+@@ -39,7 +39,9 @@ |
|
| 2 |
+ %systemd_post() \ |
|
| 3 |
+ if [ $1 -eq 1 ] ; then \ |
|
| 4 |
+ # Initial installation \ |
|
| 5 |
+- systemctl --no-reload preset %{?*} >/dev/null 2>&1 || : \
|
|
| 6 |
++ systemctl preset %{?*} >/dev/null 2>&1 || : \
|
|
| 7 |
++elif [ $1 -eq 2 ] ; then \ |
|
| 8 |
++ systemctl daemon-reload >/dev/null 2>&1 || : \ |
|
| 9 |
+ fi \ |
|
| 10 |
+ %{nil}
|
|
| 11 |
+ |
|
| 12 |
+@@ -48,7 +50,8 @@ |
|
| 13 |
+ %systemd_preun() \ |
|
| 14 |
+ if [ $1 -eq 0 ] ; then \ |
|
| 15 |
+ # Package removal, not upgrade \ |
|
| 16 |
+- systemctl --no-reload disable --now %{?*} > /dev/null 2>&1 || : \
|
|
| 17 |
++ systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
|
|
| 18 |
++ systemctl stop %{?*} > /dev/null 2>&1 || : \
|
|
| 19 |
+ fi \ |
|
| 20 |
+ %{nil}
|
|
| 21 |
+ |
|
| 22 |
+@@ -59,11 +62,14 @@ |
|
| 23 |
+ fi \ |
|
| 24 |
+ %{nil}
|
|
| 25 |
+ |
|
| 26 |
+-%systemd_postun() %{nil}
|
|
| 27 |
++%systemd_postun() \ |
|
| 28 |
++systemctl daemon-reload >/dev/null 2>&1 || : \ |
|
| 29 |
++%{nil}
|
|
| 30 |
+ |
|
| 31 |
+ %systemd_user_postun() %{nil}
|
|
| 32 |
+ |
|
| 33 |
+ %systemd_postun_with_restart() \ |
|
| 34 |
++systemctl daemon-reload >/dev/null 2>&1 || : \ |
|
| 35 |
+ if [ $1 -ge 1 ] ; then \ |
|
| 36 |
+ # Package upgrade, not uninstall \ |
|
| 37 |
+ systemctl try-restart %{?*} >/dev/null 2>&1 || : \
|
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-228 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 228 |
| 4 |
-Release: 31%{?dist}
|
|
| 4 |
+Release: 32%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ and GPLv2+ and MIT |
| 6 | 6 |
URL: http://www.freedesktop.org/wiki/Software/systemd/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -33,6 +33,7 @@ Patch17: systemd-228-domains-search-fix.patch |
| 33 | 33 |
Patch18: systemd-228-dns-transaction-pending-fix.patch |
| 34 | 34 |
Patch19: 02-install-general-aliases.patch |
| 35 | 35 |
Patch20: systemd-228-CVE-notify-socket-DOS-fix.patch |
| 36 |
+Patch21: systemd-macros.patch |
|
| 36 | 37 |
Requires: Linux-PAM |
| 37 | 38 |
Requires: libcap |
| 38 | 39 |
Requires: xz |
| ... | ... |
@@ -86,6 +87,7 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h") |
| 86 | 86 |
%patch18 -p1 |
| 87 | 87 |
%patch19 -p1 |
| 88 | 88 |
%patch20 -p1 |
| 89 |
+%patch21 -p1 |
|
| 89 | 90 |
sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf |
| 90 | 91 |
|
| 91 | 92 |
%build |
| ... | ... |
@@ -195,6 +197,8 @@ rm -rf %{buildroot}/*
|
| 195 | 195 |
%dir %{_localstatedir}/log/journal
|
| 196 | 196 |
|
| 197 | 197 |
%changelog |
| 198 |
+* Thu Nov 3 2016 Divya Thaluru <dthaluru@vmware.com> 228-32 |
|
| 199 |
+- Added logic to reload services incase of rpm upgrade |
|
| 198 | 200 |
* Thu Sep 29 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-31 |
| 199 | 201 |
- Fix a CVE in systemd-notify socket. |
| 200 | 202 |
* Mon Aug 29 2016 Alexey Makhalov <amakhalov@vmware.com> 228-30 |