From efdf4e797d1b3266d2b320996871a8fd68f9c796 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Aug 14 2014 09:38:51 +0000
Subject: dhclient-script: revert one older change


This has been reverted upstream with:

- Disable the gentle shutdown functionality until we can determine
  the best way to present it to remove or reduce the side effects.
  [ISC-Bugs #36066]

---

diff --git a/dhclient-script b/dhclient-script
index 13da000..ca895b9 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -706,9 +706,8 @@ case "${reason}" in
         # ensure interface is up
         ip link set dev ${interface} up
 
-        # aborted client cleans after itself since 4.2.6
-        # so the following is not needed anymore
-        #ip -6 addr flush dev ${interface} scope global permanent
+        # 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