dhclient-script: merge new PREINIT6S with PREINIT6

This commit is contained in:
Jiri Popelka 2015-09-22 17:33:22 +02:00
parent 59c88cb2ff
commit 15e5415130
2 changed files with 5 additions and 9 deletions

View File

@ -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

View File

@ -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);
+ }
+