1. photon
  2. Commit d9cb2d39b455aa2bfcaa41a9f833f006c9107d1b
Browse code

Fixed logic to restart the active services after upgrade

Change-Id: I1e3836cf60e0378841026b66bbaa88baacfedc9b
Reviewed-on: http://photon-jenkins.eng.vmware.com/1028
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
(cherry picked from commit ba416d95e46a8d66e60e19c2d95f6f33f282bea8)
Reviewed-on: http://photon-jenkins.eng.vmware.com/1030

dthaluru authored on 2016/05/27 05:20:57
Showing 14 changed files
SPECS/atftp/atftp.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Advanced Trivial File Transfer Protocol (ATFTP) - TFTP server
2 2 
 Name:           atftp
3 3 
 Version:        0.7.1
4 
-Release:        6%{?dist}
4 
+Release:        7%{?dist}
5 5 
 URL:            http://sourceforge.net/projects/atftp
6 6 
 License:        GPLv2+ and GPLv3+ and LGPLv2+
7 7 
 Group:          System Environment/Daemons
... ... 
@@ -104,6 +104,8 @@ if [ $1 -eq 0 ] ; then
104 104 
         groupdel tftp
105 105 
     fi
106 106 
 fi
107 
+%systemd_postun_with_restart atftpd.socket
108 
+
107 109 
 %clean
108 110 
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != '/' ] && rm -rf $RPM_BUILD_ROOT
109 111
... ... 
@@ -117,14 +119,14 @@ fi
117 117 
 /lib/systemd/system/atftpd.socket
118 118 
 %{_sysconfdir}/sysconfig/atftpd
119 119
120 
-
121 
-
122 120 
 %files client
123 121 
 %{_mandir}/man1/atftp.1.gz
124 122 
 %{_bindir}/atftp
125 123
126 124
127 125 
 %changelog
126 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.1-7
127 
+-   Fixed logic to restart the active services after upgrade
128 128 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.1-6
129 129 
 -	GA - Bump release of all rpms
130 130 
 *   Fri May 6 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.1-5
SPECS/audit/audit.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Kernel Audit Tool
2 2 
 Name:		audit
3 3 
 Version:	2.5
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
6 6 
 %define sha1 audit=b684a8dca31776a4184044733cd5fd4b1b652298
7 7 
 License:	GPLv2+
... ... 
@@ -72,7 +72,7 @@ make install DESTDIR=%{buildroot}
72 72
73 73 
 %postun
74 74 
 /sbin/ldconfig
75 
-%systemd_postun auditd.service
75 
+%systemd_postun_with_restart auditd.service
76 76
77 77 
 %preun
78 78 
 %systemd_preun auditd.service
... ... 
@@ -118,6 +118,8 @@ make install DESTDIR=%{buildroot}
118 118 
 %{_includedir}/*.h
119 119
120 120 
 %changelog
121 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.5-4
122 
+-   Fixed logic to restart the active services after upgrade
121 123 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.5-3
122 124 
 -	GA - Bump release of all rpms
123 125 
 * Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  2.5-2
SPECS/cloud-init/cloud-init.spec
History View file @ d9cb2d3
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           cloud-init
2 2 
 Version:        0.7.6
3 
-Release:        9%{?dist}
3 
+Release:        10%{?dist}
4 4 
 Summary:        Cloud instance init scripts
5 5 
 Group:          System Environment/Base
6 6 
 License:        GPLv3
... ... 
@@ -73,10 +73,10 @@ rm -rf $RPM_BUILD_ROOT
73 73 
 %systemd_preun cloud-init-local.service
74 74
75 75 
 %postun
76 
-%systemd_postun cloud-config.service
77 
-%systemd_postun cloud-final.service
78 
-%systemd_postun cloud-init.service
79 
-%systemd_postun cloud-init-local.service
76 
+%systemd_postun_with_restart cloud-config.service
77 
+%systemd_postun_with_restart cloud-final.service
78 
+%systemd_postun_with_restart cloud-init.service
79 
+%systemd_postun_with_restart cloud-init-local.service
80 80
81 81 
 %files
82 82 
 %license LICENSE
... ... 
@@ -90,6 +90,8 @@ rm -rf $RPM_BUILD_ROOT
90 90
91 91
92 92 
 %changelog
93 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.6-10
94 
+-   Fixed logic to restart the active services after upgrade
93 95 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.6-9
94 96 
 -	GA - Bump release of all rpms
95 97 
 *   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.6-8
SPECS/cronie/cronie.spec
History View file @ d9cb2d3
... ... 
@@ -73,7 +73,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
73 73
74 74 
 %postun
75 75 
 /sbin/ldconfig
76 
-%systemd_postun crond.service
76 
+%systemd_postun_with_restart crond.service
77 77
78 78 
 %preun
79 79 
 %systemd_preun crond.service
SPECS/cyrus-sasl/cyrus-sasl.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Cyrus Simple Authentication Service Layer (SASL) library
2 2 
 Name:		cyrus-sasl
3 3 
 Version:	2.1.26
4 
-Release:	7%{?dist}
4 
+Release:	8%{?dist}
5 5 
 License:	Custom
6 6 
 URL:		http://cyrusimap.web.cmu.edu/
7 7 
 Group:		System Environment/Security
... ... 
@@ -106,7 +106,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
106 106
107 107 
 %postun
108 108 
 /sbin/ldconfig
109 
-%systemd_postun saslauthd.service
109 
+%systemd_postun_with_restart saslauthd.service
110 110
111 111 
 %preun
112 112 
 %systemd_preun saslauthd.service
... ... 
@@ -126,6 +126,8 @@ rm -rf %{buildroot}/*
126 126 
 %{_datadir}/licenses/%{name}/LICENSE
127 127 
 %{_mandir}/man8/saslauthd.8.gz
128 128 
 %changelog
129 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-8
130 
+-   Fixed logic to restart the active services after upgrade
129 131 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.26-7
130 132 
 -	GA - Bump release of all rpms
131 133 
 *   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-6
SPECS/dkms/dkms.spec
History View file @ d9cb2d3
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:	Dynamic Kernel Module Support
3 3 
 Name:		dkms
4 4 
 Version:	2.2.0.3
5 
-Release:	3%{?dist}
5 
+Release:	4%{?dist}
6 6 
 License:	GPLv2+
7 7 
 URL:		http://linux.dell.com/dkms/
8 8 
 Group:		System Environment/Base
... ... 
@@ -39,7 +39,7 @@ echo "disable dkms.service" > %{buildroot}/usr/lib/systemd/system-preset/50-dkms
39 39 
 %systemd_preun dkms.service
40 40
41 41 
 %postun
42 
-%systemd_postun dkms.service
42 
+%systemd_postun_with_restart dkms.service
43 43
44 44 
 %files
45 45 
 %defattr(-,root,root)
... ... 
@@ -57,6 +57,8 @@ echo "disable dkms.service" > %{buildroot}/usr/lib/systemd/system-preset/50-dkms
57 57 
 %{_localstatedir}/lib/dkms/dkms_dbversion
58 58
59 59 
 %changelog
60 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.2.0.3-4
61 
+-   Fixed logic to restart the active services after upgrade
60 62 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.2.0.3-3
61 63 
 -	GA - Bump release of all rpms
62 64 
 *	Tue Aug 25 2015 Alexey Makhalov <amakhalov@vmware.com> 2.2.0.3-2
SPECS/docker/docker.spec
History View file @ d9cb2d3
... ... 
@@ -36,7 +36,10 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
36 36 
 %post
37 37 
 /sbin/ldconfig
38 38
39 
-%postun	-p /sbin/ldconfig
39 
+%postun
40 
+/sbin/ldconfig
41 
+%systemd_postun_with_restart docker-containerd.service
42 
+%systemd_postun_with_restart docker.service
40 43
41 44
42 45 
 %clean
... ... 
@@ -48,8 +51,10 @@ rm -rf %{buildroot}/*
48 48 
 /lib/systemd/system/docker-containerd.service
49 49
50 50 
 %changelog
51 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.11.0-5
52 
--	GA - Bump release of all rpms
51 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  1.11.0-6
52 
+-   Fixed logic to restart the active services after upgrade
53 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.11.0-5
54 
+-   GA - Bump release of all rpms
53 55 
 *   Tue May 10 2016 Anish Swaminathan <anishs@vmware.com> 1.11.0-4
54 56 
 -   Remove commented post actions
55 57 
 *   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  1.11.0-3
SPECS/ostree/ostree.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Git for operating system binaries
2 2 
 Name:		ostree
3 3 
 Version:	2015.7
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz
6 6 
 %define sha1 ostree=baa502aa46363cd4828d257fb87f5e18a7ed000a
7 7 
 Source1:	91-ostree.preset
... ... 
@@ -95,6 +95,9 @@ rm -rf %{buildroot}
95 95 
 %preun
96 96 
 %systemd_preun ostree-remount.service
97 97
98 
+%postun
99 
+%systemd_postun_with_restart ostree-remount.service
100 
+
98 101 
 %files
99 102 
 %doc COPYING README.md
100 103 
 %{_bindir}/ostree
... ... 
@@ -123,6 +126,8 @@ rm -rf %{buildroot}
123 123 
 %{_datadir}/gir-1.0/OSTree-1.0.gir
124 124
125 125 
 %changelog
126 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2015.7-5
127 
+-   Fixed logic to restart the active services after upgrade
126 128 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2015.7-4
127 129 
 -	GA - Bump release of all rpms
128 130 
 *	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 2015.7-3
SPECS/rsyslog/rsyslog.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Rocket-fast system for log processing
2 2 
 Name:		rsyslog
3 3 
 Version:	8.15.0
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	GPLv3+ and ASL 2.0
6 6 
 URL:		http://www.rsyslog.com/
7 7 
 Source0:	http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
... ... 
@@ -61,7 +61,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
61 61
62 62 
 %postun
63 63 
 /sbin/ldconfig
64 
-
64 
+%systemd_postun_with_restart rsyslog.service
65 65
66 66 
 %files
67 67 
 %defattr(-,root,root)
... ... 
@@ -72,6 +72,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
72 72 
 %{_libdir}/systemd/system/rsyslog.service
73 73 
 %{_sysconfdir}/systemd/journald.conf.d/*
74 74 
 %changelog
75 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  8.15.0-5
76 
+-   Fixed logic to restart the active services after upgrade
75 77 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-4
76 78 
 -	GA - Bump release of all rpms
77 79 
 *   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  8.15.0-3
SPECS/sendmail/sendmail.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Commonly used Mail transport agent (MTA)
2 2 
 Name:           sendmail
3 3 
 Version:        8.15.2
4 
-Release:        5%{?dist}
4 
+Release:        6%{?dist}
5 5 
 URL:            http://www.sendmail.org/
6 6 
 License:        GPLv2+ and GPLv3+ and LGPLv2+
7 7 
 Group:          Email/Server/Library
... ... 
@@ -153,6 +153,7 @@ if [ $1 -eq 0 ] ; then
153 153
154 154 
   rm -rf /etc/mail
155 155 
 fi
156 
+%systemd_postun_with_restart sendmail.service
156 157
157 158 
 %files
158 159 
 %{_sysconfdir}/*
... ... 
@@ -167,6 +168,8 @@ fi
167 167
168 168
169 169 
 %changelog
170 
+*       Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.2-6
171 
+-       Fixed logic to restart the active services after upgrade
170 172 
 *       Wed May 25 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-5
171 173 
 -       Adding dependencies and fixing post section installation bug.
172 174 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-4
SPECS/syslog-ng/syslog-ng.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Next generation system logger facilty
2 2 
 Name:		syslog-ng
3 3 
 Version:	3.6.4
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	GPL + LGPL
6 6 
 URL:		https://www.balabit.com/network-security/syslog-ng/opensource-logging-system
7 7 
 Group:		System Environment/Daemons
... ... 
@@ -83,6 +83,9 @@ fi
83 83 
 %preun
84 84 
 %systemd_preun syslog-ng.service
85 85
86 
+%postun
87 
+%systemd_postun_with_restart syslog-ng.service
88 
+
86 89 
 %clean
87 90 
 rm -rf %{buildroot}/*
88 91
... ... 
@@ -117,6 +120,8 @@ rm -rf %{buildroot}/*
117 117 
 /usr/lib/pkgconfig/syslog-ng.pc
118 118
119 119 
 %changelog
120 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  3.6.4-5
121 
+-   Fixed logic to restart the active services after upgrade
120 122 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6.4-4
121 123 
 -	GA - Bump release of all rpms
122 124 
 *   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  3.6.4-3
SPECS/tftp/tftp.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	The client for the Trivial File Transfer Protocol (TFTP)
2 2 
 Name:		tftp
3 3 
 Version:	5.2
4 
-Release:	5%{?dist}
4 
+Release:	6%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		http://www.kernel.org
7 7 
 Group:		Applications/Internet
... ... 
@@ -75,7 +75,10 @@ EOF
75 75 
 %systemd_preun tftpd.socket
76 76
77 77 
 %post
78 
-%systemd_preun tftpd.socket
78 
+%systemd_post tftpd.socket
79 
+
80 
+%postun
81 
+%systemd_postun_with_restart tftpd.socket
79 82
80 83 
 %clean
81 84 
 rm -rf %{buildroot}
... ... 
@@ -95,6 +98,8 @@ rm -rf %{buildroot}
95 95 
 /lib/systemd/system/tftpd.socket
96 96
97 97 
 %changelog
98 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  5.2-6
99 
+-   Fixed logic to restart the active services after upgrade
98 100 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.2-5
99 101 
 -	GA - Bump release of all rpms
100 102 
 *   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.2-4
SPECS/xinetd/xinetd.spec
History View file @ d9cb2d3
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:  	xinetd -- A better inetd.
2 2 
 Name:		xinetd
3 3 
 Version:	2.3.15
4 
-Release:	5%{?dist}
4 
+Release:	6%{?dist}
5 5 
 License:	BSD
6 6 
 Group:		System Environment/Daemons
7 7 
 Vendor:     	VMware, Inc.
... ... 
@@ -56,6 +56,9 @@ fi
56 56 
 %preun
57 57 
 %systemd_preun xinetd.service
58 58
59 
+%postun
60 
+%systemd_postun_with_restart xinetd.service
61 
+
59 62 
 %files
60 63 
 %defattr(-, root, root)
61 64 
 %doc CHANGELOG COPYRIGHT README xinetd/sample.conf contrib/empty.conf
... ... 
@@ -66,6 +69,8 @@ fi
66 66 
 /lib/systemd/system/xinetd.service
67 67
68 68 
 %changelog
69 
+*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.3.15-6
70 
+-   Fixed logic to restart the active services after upgrade
69 71 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.15-5
70 72 
 -	GA - Bump release of all rpms
71 73 
 *   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.15-4
SPECS/zookeeper/zookeeper.spec
History View file @ d9cb2d3
... ... 
@@ -87,7 +87,7 @@ fi
87 87 
 %systemd_preun zookeeper.service
88 88
89 89 
 %postun
90 
-%systemd_postun zookeeper.service
90 
+%systemd_postun_with_restart zookeeper.service
91 91 
 if [ $1 -eq 0 ] ; then
92 92 
     /usr/sbin/userdel zookeeper
93 93 
     /usr/sbin/groupdel hadoop