rpms/dhcp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

amend post scriptlets for #1120656

Browse Source
This commit is contained in:
Jiri Popelka 2014-11-19 12:23:14 +01:00
parent 81262d499a
commit d9a087ceae
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dhcp.spec
View File

@ -18,7 +18,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.1 Version: 4.3.1
Release: 15%{?dist} Release: 16%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -539,7 +539,8 @@ chown -R dhcpd:dhcpd %{_localstatedir}/lib/dhcpd/
for servicename in dhcpd dhcpd6; do for servicename in dhcpd dhcpd6; do
etcservicefile=%{_sysconfdir}/systemd/system/${servicename}.service etcservicefile=%{_sysconfdir}/systemd/system/${servicename}.service
if [ -f ${etcservicefile} ]; then if [ -f ${etcservicefile} ]; then
grep -q Type= ${etcservicefile} || sed -i '/\[Service\]/a Type=notify' ${etcservicefile} grep -q Type= ${etcservicefile} || %{__sed} -i '/\[Service\]/a Type=notify' ${etcservicefile}
%{__sed} -i 's/After=network.target/Wants=network-online.target\nAfter=network-online.target/' ${etcservicefile}
fi fi
done done
exit 0 exit 0
@ -551,7 +552,8 @@ exit 0
for servicename in dhcrelay; do for servicename in dhcrelay; do
etcservicefile=%{_sysconfdir}/systemd/system/${servicename}.service etcservicefile=%{_sysconfdir}/systemd/system/${servicename}.service
if [ -f ${etcservicefile} ]; then if [ -f ${etcservicefile} ]; then
grep -q Type= ${etcservicefile} || sed -i '/\[Service\]/a Type=notify' ${etcservicefile} grep -q Type= ${etcservicefile} || %{__sed} -i '/\[Service\]/a Type=notify' ${etcservicefile}
%{__sed} -i 's/After=network.target/Wants=network-online.target\nAfter=network-online.target/' ${etcservicefile}
fi fi
done done
exit 0 exit 0
@ -674,6 +676,9 @@ done
%doc doc/html/ %doc doc/html/
%changelog %changelog
* Wed Nov 19 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-16
- amend post scriptlets for #1120656
* Mon Nov 10 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-15 * Mon Nov 10 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-15
- dhclient-script: restorecon calls shouldn't be needed - dhclient-script: restorecon calls shouldn't be needed
as we have SELinux transition rules (#1161500) as we have SELinux transition rules (#1161500)