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

Drop 12-dhcpd dispatcher (#1780861)

Browse Source
This commit is contained in:
Pavel Zhukov 2020-01-06 18:21:53 +01:00
parent 5fe96d93a8
commit def209d1bf
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
12-dhcpd
View File

@ -1,23 +0,0 @@
#!/bin/bash
## this script is disabled by default
## if you want one to be executed on NM up events
## please make it executable. See chmod(1) for more details
INTERFACE=$1 # The interface which is brought up or down
STATUS=$2 # The new state of the interface
# whenever interface is brought up by NM (rhbz #565921)
if [ "$STATUS" = "up" ]; then
# wait a few seconds to allow interface startup to complete
# (important at boot time without this the service still fails
# time-out for dispatcher script is 3s (rhbz#1003695#8)
sleep 2
# restart the services
# In case this dispatcher script is called several times in a short period of time, it might happen that
# systemd refuses to further restart the units. Therefore we use reset-failed command to prevent it.
systemctl -q is-enabled dhcpd.service && systemctl restart dhcpd.service && systemctl reset-failed dhcpd.service
systemctl -q is-enabled dhcpd6.service && systemctl restart dhcpd6.service && systemctl reset-failed dhcpd6.service
fi
exit 0

13
dhcp.spec
View File

@ -15,7 +15,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.4.2
Release: 1.b1%{?dist}
Release: 2.b1%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
@ -28,16 +28,11 @@ Source0: ftp://ftp.isc.org/isc/dhcp/%{DHCPVERSION}/dhcp-%{DHCPVERSION}.tar.gz
Source1: dhclient-script
Source2: README.dhclient.d
Source3: 11-dhclient
Source4: 12-dhcpd
Source5: 56dhclient
Source6: dhcpd.service
Source7: dhcpd6.service
Source8: dhcrelay.service
Patch1 : 0001-change-bug-url.patch
Patch2 : 0002-additional-dhclient-options.patch
Patch3 : 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch
@ -104,8 +99,6 @@ Requires(post): coreutils grep sed
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
# Old NetworkManager expects the dispatcher scripts in a different place
Conflicts: NetworkManager < 1.20
%description server
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@ -293,7 +286,6 @@ mkdir -p %{buildroot}%{dhcpconfdir}/dhclient.d
# NetworkManager dispatcher script
mkdir -p %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d
install -p -m 0755 %{SOURCE3} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d
install -p -m 0644 %{SOURCE4} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d
# pm-utils script to handle suspend/resume and dhclient leases
install -D -p -m 0755 %{SOURCE5} %{buildroot}%{_libdir}/pm-utils/sleep.d/56dhclient
@ -535,6 +527,9 @@ done
%endif
%changelog
* Mon Jan 6 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.4.2-2.b1
- Drop NetworkManager 12-dhcpd script. It's deprecated by wait-online (#1780861)
* Mon Jan 6 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.4.2-1.b1
- Dropped all (pre 4.0.0) changelog
- New version (4.4.2b1)