From b81510d1c4e2fd8f7cbe8da10168cd64aabe5c01 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Aug 14 2014 12:53:19 +0000
Subject: dhclient-script: one more fix for #1129500


---

diff --git a/dhclient-script b/dhclient-script
index ca895b9..ba89d97 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -711,9 +711,10 @@ case "${reason}" in
 
         # we need a link-local address to be ready (not tentative)
         for i in $(seq 50); do
-            # tentative flag == DAD is still not complete
-            tentative=$(ip -6 addr show dev ${interface} scope link | grep tentative)
-            [[ -z "${tentative}" ]] && exit_with_hooks 0
+            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
 
diff --git a/dhcp.spec b/dhcp.spec
index 2fb34bb..26da3e6 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.1
-Release:  2%{?dist}
+Release:  3%{?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.
@@ -592,6 +592,9 @@ done
 %doc doc/html/
 
 %changelog
+* Thu Aug 14 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-3
+- dhclient-script: one more fix for #1129500
+
 * Thu Aug 14 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.1-2
 - dhclient-script: PREINIT6: make sure link-local address is available (#1129500)