From 15e541513042d9a41488adb1359408729726b2ff Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Sep 22 2015 15:33:22 +0000
Subject: dhclient-script: merge new PREINIT6S with PREINIT6


---

diff --git a/dhclient-script b/dhclient-script
index 4117d42..36c317f 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -777,20 +777,16 @@ case "${reason}" in
         # ensure interface is up
         ip link set dev "${interface}" up
 
-        # remove any stale addresses from aborted clients
-        ip -6 addr flush dev "${interface}" scope global permanent
+        # Removing stale addresses from aborted clients shouldn't be needed
+        # since we've been adding addresses with lifetimes.
+        # Which means that kernel eventually removes them automatically.
+        # ip -6 addr flush dev "${interface}" scope global permanent
 
         wait_for_link_local
 
         exit_with_hooks 0
         ;;
 
-    PREINIT6S)  # stateless
-        ip link set dev "${interface}" up
-        wait_for_link_local
-        exit_with_hooks 0
-        ;;
-
     BOUND|RENEW|REBIND|REBOOT)
         if [ -z "${interface}" ] || [ -z "${new_ip_address}" ]; then
             exit_with_hooks 2
diff --git a/dhcp-dhclient-preinit6s.patch b/dhcp-dhclient-preinit6s.patch
index f45e9a9..1fd158d 100644
--- a/dhcp-dhclient-preinit6s.patch
+++ b/dhcp-dhclient-preinit6s.patch
@@ -47,7 +47,7 @@ diff -up dhcp-4.3.3/client/dhclient.c.preinit6s dhcp-4.3.3/client/dhclient.c
 +				   INTERFACE_AUTOMATIC)) !=
 +		     INTERFACE_REQUESTED))
 +			continue;
-+		script_init(ip->client, "PREINIT6S", NULL);
++		script_init(ip->client, "PREINIT6", NULL);
 +		script_go(ip->client);
 +	}
 +