Browse code

Removed unwanted service dependency from systemd, crond , cloud-init service files

Change-Id: I8b1e3d5c5bfd61a95c57f12b515a8422c26a977d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3355
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

DheerajSShetty authored on 2017/07/29 04:30:48
Showing 9 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,55 @@
0
+Summary:	Irqbalance daemon
1
+Name:		irqbalance
2
+Version:	1.1.0
3
+Release:	3%{?dist}
4
+License:	GPLv2
5
+URL:		https://github.com/Irqbalance/irqbalance
6
+Group:		System Environment/Services
7
+Vendor:		VMware, Inc.
8
+Distribution:	Photon
9
+Source0:	https://github.com/Irqbalance/%{name}/archive/v%{version}.tar.gz
10
+%define sha1 v1=bffafb547dd24a15645dbd1968c440218de6425d
11
+BuildRequires:  systemd
12
+Requires:  systemd
13
+%description
14
+Irqbalance is a daemon to help balance the cpu load generated by
15
+interrupts across all of a systems cpus.
16
+%prep
17
+%setup -q
18
+%build
19
+./autogen.sh
20
+./configure \
21
+	--prefix=%{_prefix} \
22
+	--disable-static \
23
+	--with-systemd
24
+	
25
+make %{?_smp_mflags}
26
+%install
27
+make DESTDIR=%{buildroot} install
28
+install -D -m 0644 misc/irqbalance.env %{buildroot}/etc/sysconfig/irqbalance
29
+sed -i 's#/path/to/irqbalance.env#/etc/sysconfig/irqbalance#' misc/irqbalance.service
30
+sed -i 's/syslog.target//g' misc/irqbalance.service
31
+install -D -m 0644 misc/irqbalance.service %{buildroot}%{_prefix}/lib/systemd/system/irqbalance.service
32
+
33
+%post
34
+%systemd_post %{name}.service
35
+%preun
36
+%systemd_preun %{name}.service
37
+%postun
38
+%systemd_postun_with_restart %{name}.service
39
+
40
+%files
41
+%defattr(-,root,root)
42
+%config(noreplace) %{_sysconfdir}/*
43
+%{_sbindir}/*
44
+%exclude %{_libdir}/debug/*
45
+%{_libdir}/systemd/*
46
+%{_datadir}/*
47
+
48
+%changelog
49
+*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.0-3
50
+-	GA - Bump release of all rpms
51
+*  Thu May 05 2016 Kumar Kaushik <kaushikk@vmware.com> 1.1.0-2
52
+-  Adding package upgrade support.
53
+*  Fri Jan 15 2016 Alexey Makhalov <amakhalov@vmware.com> 1.1.0-1
54
+-  Initial version
... ...
@@ -2,7 +2,7 @@
2 2
 
3 3
 Name:           cloud-init
4 4
 Version:        0.7.9
5
-Release:        2%{?dist}
5
+Release:        3%{?dist}
6 6
 Summary:        Cloud instance init scripts
7 7
 Group:          System Environment/Base
8 8
 License:        GPLv3
... ...
@@ -80,6 +80,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/
80 80
 cp -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg
81 81
 # Disable networking config by cloud-init
82 82
 cp -p %{SOURCE2} %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg.d/
83
+sed -i 's/Before=NetworkManager.service//g'  %{buildroot}/lib/systemd/system/cloud-init-local.service
84
+sed -i 's/After=networking.service//g'  %{buildroot}/lib/systemd/system/cloud-init.service
83 85
 
84 86
 %check
85 87
 openssl req \
... ...
@@ -195,6 +197,9 @@ systemctl daemon-reload >/dev/null 2>&1 || :
195 195
 
196 196
 
197 197
 %changelog
198
+*   Fri Jul 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.9-3
199
+-   Removed networking.service and NetworkManger.service from
200
+-   cloud-init and cloud-init-local service files
198 201
 *   Wed Jul 19 2017 Divya Thaluru <dthaluru@vmware.com> 0.7.9-2
199 202
 -   Enabled openstack provider
200 203
 *   Wed May 24 2017 Kumar Kaushik <kaushikk@vmware.com> 0.7.9-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Cron Daemon
2 2
 Name:           cronie
3 3
 Version:        1.5.0
4
-Release:        11%{?dist}
4
+Release:        12%{?dist}
5 5
 License:        GPLv2+ and MIT and BSD and ISC
6 6
 URL:            https://fedorahosted.org/cronie
7 7
 Source0:        https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
... ...
@@ -62,6 +62,7 @@ touch %{buildroot}/var/spool/anacron/cron.monthly
62 62
 install -vdm755 %{buildroot}/%{_sysconfdir}/pam.d
63 63
 install -vd %{buildroot}%{_libdir}/systemd/system/
64 64
 install -m 644 contrib/cronie.systemd %{buildroot}%{_libdir}/systemd/system/crond.service
65
+sed -i 's/ypbind.service//g' %{buildroot}%{_libdir}/systemd/system/crond.service
65 66
 install -c -m755  %{SOURCE1} %{buildroot}/%{_bindir}/run-parts
66 67
 
67 68
 ln -sfv ./crond.service %{buildroot}/usr/lib/systemd/system/cron.service
... ...
@@ -106,6 +107,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
106 106
 /var/spool/anacron/cron.monthly
107 107
 /var/spool/anacron/cron.weekly
108 108
 %changelog
109
+*   Fri Jul 28 2017 Dheerajs Shetty <dheerajs@vmware.com>  1.5.0-12
110
+-   Remove ypbind.service from crond.service file
109 111
 *   Mon Aug 29 2016 Divya Thaluru <dthaluru@vmware.com>  1.5.0-11
110 112
 -   Fixed pam configuration for crond
111 113
 *   Thu Aug 4 2016 Divya Thaluru <dthaluru@vmware.com>  1.5.0-10
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Irqbalance daemon
2 2
 Name:		irqbalance
3 3
 Version:	1.1.0
4
-Release:	3%{?dist}
4
+Release:	4%{?dist}
5 5
 License:	GPLv2
6 6
 URL:		https://github.com/Irqbalance/irqbalance
7 7
 Group:		System Environment/Services
... ...
@@ -28,6 +28,7 @@ make %{?_smp_mflags}
28 28
 make DESTDIR=%{buildroot} install
29 29
 install -D -m 0644 misc/irqbalance.env %{buildroot}/etc/sysconfig/irqbalance
30 30
 sed -i 's#/path/to/irqbalance.env#/etc/sysconfig/irqbalance#' misc/irqbalance.service
31
+sed -i 's/After=syslog.target//g' misc/irqbalance.service
31 32
 install -D -m 0644 misc/irqbalance.service %{buildroot}%{_prefix}/lib/systemd/system/irqbalance.service
32 33
 
33 34
 %post
... ...
@@ -46,6 +47,8 @@ install -D -m 0644 misc/irqbalance.service %{buildroot}%{_prefix}/lib/systemd/sy
46 46
 %{_datadir}/*
47 47
 
48 48
 %changelog
49
+*  Thu Jul 27 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.1.0-4
50
+-  Remove syslog.target from the service file
49 51
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.0-3
50 52
 -	GA - Bump release of all rpms
51 53
 *  Thu May 05 2016 Kumar Kaushik <kaushikk@vmware.com> 1.1.0-2
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Network Time Protocol reference implementation
2 2
 Name:           ntp
3 3
 Version:        4.2.8p10
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        NTP
6 6
 URL:            http://www.ntp.org/
7 7
 Group:          System Environment/NetworkingPrograms
... ...
@@ -82,7 +82,7 @@ mkdir -p %{buildroot}/lib/systemd/system
82 82
 cat << EOF >> %{buildroot}/lib/systemd/system/ntpd.service
83 83
 [Unit]
84 84
 Description=Network Time Service
85
-After=syslog.target network.target
85
+After=network.target
86 86
 Documentation=man:ntpd
87 87
 Conflicts=systemd-timesyncd.service
88 88
 
... ...
@@ -138,6 +138,8 @@ rm -rf %{buildroot}/*
138 138
 %{_mandir}/man8/ntpstat.8*
139 139
 
140 140
 %changelog
141
+*   Thu Jul 27 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.2.8p10-3
142
+-   Remove syslog.target from service file
141 143
 *   Mon Apr 10 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.8p10-2
142 144
 -   add noquery to conf
143 145
 *   Wed Apr 05 2017 Anish Swaminathan <anishs@vmware.com> 4.2.8p10-1
... ...
@@ -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:        9%{?dist}
4
+Release:        10%{?dist}
5 5
 URL:            http://www.sendmail.org/
6 6
 License:        GPLv2+ and GPLv3+ and LGPLv2+
7 7
 Group:          Email/Server/Library
... ...
@@ -104,7 +104,7 @@ cat > %{buildroot}/etc/systemd/system/sendmail.service <<- "EOF"
104 104
 [Unit]
105 105
 Description=Sendmail Mail Transport Agent
106 106
 Wants=network-online.target
107
-After=network-online.target syslog.target network.target
107
+After=network-online.target network.target
108 108
 
109 109
 [Service]
110 110
 Environment=QUEUE=1h
... ...
@@ -187,6 +187,8 @@ fi
187 187
 
188 188
 
189 189
 %changelog
190
+*       Thu Jul 27 2017 Dheeraj Shetty <dheerajs@vmware.com> 8.15.2-10
191
+-       Remove syslog.target from the service file
190 192
 *       Fri Mar 24 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-9
191 193
 -       No replace for config files on upgrade.
192 194
 *       Wed Mar 22 2017 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-8
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:          Systemd-228
2 2
 Name:             systemd
3 3
 Version:          228
4
-Release:          35%{?dist}
4
+Release:          36%{?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
... ...
@@ -132,9 +132,25 @@ sed -i '/srv/d' %{buildroot}/usr/lib/tmpfiles.d/home.conf
132 132
 sed -i "s:0775 root lock:0755 root root:g" %{buildroot}/usr/lib/tmpfiles.d/legacy.conf
133 133
 sed -i "s:NamePolicy=kernel database onboard slot path:NamePolicy=kernel database:g" %{buildroot}/lib/systemd/network/99-default.link
134 134
 sed -i "s:#LLMNR=yes:LLMNR=false:g" %{buildroot}/etc/systemd/resolved.conf
135
+sed -i 's/systemd-sysusers.service//g' %{buildroot}/lib/systemd/system/systemd-networkd.service
136
+sed -i 's/systemd-sysusers.service//g' %{buildroot}/lib/systemd/system/systemd-udevd.service
137
+sed -i 's/After=systemd-sysusers.service//g' %{buildroot}/lib/systemd/system/systemd-tmpfiles-setup-dev.service
138
+sed -i 's/systemd-sysusers.service//g' %{buildroot}/lib/systemd/system/systemd-tmpfiles-setup.service
139
+sed -i 's/systemd-sysusers.service//g' %{buildroot}/lib/systemd/system/systemd-timesyncd.service
140
+sed -i 's/plymouth-start.service//g' %{buildroot}/lib/systemd/system/systemd-ask-password-console.service
141
+sed -i 's/After=plymouth-start.service//g' %{buildroot}/lib/systemd/system/systemd-ask-password-console.path
142
+sed -i 's/plymouth-start.service//g' %{buildroot}/lib/systemd/system/rescue.service
143
+sed -i 's/plymouth-quit-wait.service//g' %{buildroot}/lib/systemd/system/container-getty@.service
144
+sed -i 's/plymouth-quit-wait.service//g' %{buildroot}/lib/systemd/system/getty@.service
145
+sed -i 's/plymouth-quit-wait.service//g' %{buildroot}/lib/systemd/system/autovt@.service
146
+sed -i 's/plymouth-quit-wait.service//g' %{buildroot}/lib/systemd/system/serial-getty@.service
147
+sed -i 's/plymouth-quit-wait.service//g' %{buildroot}/lib/systemd/system/console-getty.service
148
+sed -i 's/plymouth-quit-wait.service//g' %{buildroot}/lib/systemd/system/console-shell.service
149
+
135 150
 rm -f %{buildroot}%{_var}/log/README
136 151
 mkdir -p %{buildroot}%{_localstatedir}/log/journal
137 152
 
153
+
138 154
 #cp %{buildroot}/usr/share/factory/etc/pam.d/system-auth %{buildroot}%{_sysconfdir}/pam.d/system-auth
139 155
 #cp %{buildroot}/usr/share/factory/etc/pam.d/other %{buildroot}%{_sysconfdir}/pam.d/other
140 156
 find %{buildroot}%{_libdir} -name '*.la' -delete
... ...
@@ -202,7 +218,11 @@ rm -rf %{buildroot}/*
202 202
 %{_datadir}/*
203 203
 %dir %{_localstatedir}/log/journal
204 204
 
205
+
205 206
 %changelog
207
+*    Fri Jul 28 2017 Dheeraj Shetty <dheerajs@vmware.com>  228-36
208
+-    Removed systemd-sysusers.service,plymouth-quit-wait.service and
209
+-    plymouth-start.service from all service files.
206 210
 *    Thu Jun 29 2017 Vinay Kulkarni <kulkarniv@vmware.com>  228-35
207 211
 -    Fix for CVE-2017-9445.
208 212
 *    Sat Jan 22 2017 Vinay Kulkarni <kulkarniv@vmware.com>  228-34
... ...
@@ -1,7 +1,7 @@
1 1
 #copied from xinetd-2.3.15-15.fc22.x86_64.rpm
2 2
 [Unit]
3 3
 Description=Xinetd A Powerful Replacement For Inetd
4
-After=syslog.target network.target
4
+After=network.target
5 5
 Documentation=man:xinetd
6 6
 Documentation=man:xinetd.conf
7 7
 Documentation=man:xinetd.log
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:  	xinetd -- A better inetd.
2 2
 Name:		xinetd
3 3
 Version:	2.3.15
4
-Release:	6%{?dist}
4
+Release:	7%{?dist}
5 5
 License:	BSD
6 6
 Group:		System Environment/Daemons
7 7
 Vendor:     	VMware, Inc.
... ...
@@ -69,6 +69,8 @@ fi
69 69
 /lib/systemd/system/xinetd.service
70 70
 
71 71
 %changelog
72
+*   Thu Jul 27 2017 Dheeraj Shetty <dheerajs@vmware.com>  2.3.15-7
73
+-   Removed syslog.target from service file 
72 74
 *   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.3.15-6
73 75
 -   Fixed logic to restart the active services after upgrade 
74 76
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.15-5