[dhcp] remove inherit-leases.patch - it's probably not needed anymore (#815355)
Jiří Popelka
jpopelka at fedoraproject.org
Thu Apr 26 16:24:42 UTC 2012
commit 634087ae6d1b75f387bf556684ad01f94624eca5
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Thu Apr 26 14:45:26 2012 +0200
remove inherit-leases.patch - it's probably not needed anymore (#815355)
dhclient-script | 15 +++++----------
dhcp-4.2.0-inherit-leases.patch | 34 ----------------------------------
dhcp.spec | 9 ++++-----
3 files changed, 9 insertions(+), 49 deletions(-)
---
diff --git a/dhclient-script b/dhclient-script
index b542082..3425e4b 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -349,7 +349,7 @@ dhconfig() {
[ ! "${old_broadcast_address}" = "${new_broadcast_address}" ] ||
[ ! "${old_routers}" = "${new_routers}" ] ||
[ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
- ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
+ ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} >/dev/null 2>&1
ip link set dev ${interface} up
# The 576 MTU is only used for X.25 and dialup connections
@@ -358,7 +358,7 @@ dhconfig() {
# disallow MTUs from 576 and below by default, so that broken
# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
if [ -n "${new_interface_mtu}" ] && [ ${new_interface_mtu} -gt 576 ]; then
- ip link set ${interface} mtu ${new_interface_mtu}
+ ip link set dev ${interface} mtu ${new_interface_mtu}
fi
if [ -x ${ETCDIR}/dhclient-${interface}-up-hooks ]; then
@@ -661,14 +661,9 @@ case "${reason}" in
ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1
fi
- if [ "${keep_old_ip}" = "yes" ]; then
- ip link set ${interface} up
- else
- ip -4 addr flush dev ${interface} >/dev/null 2>&1
- ip link set ${interface} up
- fi
-
+ ip link set dev ${interface} up
if [ -n "${DHCLIENT_DELAY}" ] && [ ${DHCLIENT_DELAY} -gt 0 ]; then
+ # We need to give the kernel some time to get the interface up.
sleep ${DHCLIENT_DELAY}
fi
@@ -677,7 +672,7 @@ case "${reason}" in
PREINIT6)
# ensure interface is up
- ip link set ${interface} up
+ ip link set dev ${interface} up
# remove any stale addresses from aborted clients
ip -6 addr flush dev ${interface} scope global permanent
diff --git a/dhcp.spec b/dhcp.spec
index 19f4899..68c6f80 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -19,7 +19,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.2.4
-Release: 0.2.%{prever}%{?dist}
+Release: 0.3.%{prever}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# 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.
@@ -48,7 +48,6 @@ Patch8: dhcp-4.2.2-xen-checksum.patch
Patch10: dhcp-4.2.1-manpages.patch
Patch11: dhcp-4.2.4-paths.patch
Patch12: dhcp-4.2.2-CLOEXEC.patch
-Patch13: dhcp-4.2.0-inherit-leases.patch
Patch14: dhcp-4.2.0-garbage-chars.patch
Patch15: dhcp-4.2.0-missing-ipv6-not-fatal.patch
Patch17: dhcp-4.2.0-add_timeout_when_NULL.patch
@@ -213,9 +212,6 @@ rm bind/bind.tar.gz
# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #19148])
%patch12 -p1 -b .cloexec
-# If we have an active lease, do not down the interface (#453982)
-%patch13 -p1 -b .inherit
-
# Fix 'garbage in format string' error (#450042)
%patch14 -p1 -b .garbage
@@ -604,6 +600,9 @@ fi
%changelog
+* Thu Apr 26 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-0.3.b1
+- remove inherit-leases.patch - it's probably not needed anymore (#815355)
+
* Wed Apr 18 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-0.2.b1
- update paths.patch and source URL
More information about the scm-commits
mailing list