[dhcp] - dhclient-script: IPv6 address which fails DAD is auto-removed (#1133465)
Jiří Popelka
jpopelka at fedoraproject.org
Mon Aug 25 17:19:42 UTC 2014
commit a6e84ccd33e405507d63002c599cacbb9e115919
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Mon Aug 25 18:57:47 2014 +0200
- dhclient-script: IPv6 address which fails DAD is auto-removed (#1133465)
dhclient-script | 11 +++++++++--
dhcp.spec | 2 ++
2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/dhclient-script b/dhclient-script
index ba89d97..e5a6830 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -575,8 +575,15 @@ add_ipv6_addr_with_DAD() {
exit_with_hooks 3
fi
if [ -z "${tentative}" ] ; then
- # DAD is over
- return 0
+ addr=$(ip -6 addr show dev ${interface} \
+ | grep ${new_ip6_address}/${new_ip6_prefixlen})
+ if [ -n "${addr}" ]; then
+ # DAD is over
+ return 0
+ else
+ # address was auto-removed (or not added at all)
+ exit_with_hooks 3
+ fi
fi
done
}
diff --git a/dhcp.spec b/dhcp.spec
index e1b2331..0f4c5df 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -648,6 +648,8 @@ done
%changelog
* Mon Aug 25 2014 Jiri Popelka <jpopelka at redhat.com> - 12:4.3.1-5
- spec: use -D with 'install'
+- dhclient-script: IPv6 address which fails DAD is auto-removed when it was
+ added with valid_lft/preferred_lft other then 'forever' (#1133465)
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12:4.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list