From 88bb3be48ee88795f43ba90c4ef1bf3a33a03c96 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Aug 14 2014 13:02:00 +0000
Subject: dhclient-script: PREINIT6: make sure link-local address is available (#1129500)


---

diff --git a/dhclient-script b/dhclient-script
index 953b81e..5b1c4e8 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -701,6 +701,15 @@ case "${reason}" in
         # remove any stale addresses from aborted clients
         ip -6 addr flush dev ${interface} scope global permanent
 
+        # we need a link-local address to be ready (not tentative)
+        for i in $(seq 50); do
+            linklocal=$(ip -6 addr show dev ${interface} scope link)
+            # tentative flag means DAD is still not complete
+            tentative=$(echo "${linklocal}" | grep tentative)
+            [[ -n "${linklocal}" && -z "${tentative}" ]] && exit_with_hooks 0
+            sleep 0.1
+        done
+
         exit_with_hooks 0
         ;;
 
diff --git a/dhcp.spec b/dhcp.spec
index e8e359a..b306239 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.7
-Release:  1%{?dist}
+Release:  2%{?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.
@@ -602,6 +602,9 @@ done
 
 
 %changelog
+* Thu Aug 14 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.7-2
+- dhclient-script: PREINIT6: make sure link-local address is available (#1129500)
+
 * Tue Aug 12 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.7-1
 - 4.2.7