behave differently if we got a renewal via INIT-REBOOT

diff --git a/client/dhclient.c b/client/dhclient.c
index 4f81b3a1990871ff94cd56e4e3ae832c4527fece..a0c4dfd16da8d923b91c7ca67c3fa6f4277f6a03 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhclient.c,v 1.29 1997/03/05 06:30:08 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.30 1997/03/05 08:38:02 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -456,8 +456,10 @@ void dhcpack (packet)
                          ? "BOUND"
                          : (ip -> client -> state == S_RENEWING
                             ? "RENEW"
-                            : "REBIND")), ip -> client -> new -> medium);
-       if (ip -> client -> active)
+                            : (ip -> client -> state == S_REBOOTING
+                               ? "REBOOT" : "REBIND"))),
+                    ip -> client -> new -> medium);
+       if (ip -> client -> active && ip -> client -> state != S_REBOOTING)
                script_write_params (ip, "old_", ip -> client -> active);
        script_write_params (ip, "new_", ip -> client -> new);
        if (ip -> client -> alias)

diff --git a/client/scripts/netbsd b/client/scripts/netbsd
index c734ef8eb3c39998e53494d998064de4646f1c7f..01d82f1207f510e00b8ab6696abfa21c3c9fe8fe 100755 (executable)
--- a/client/scripts/netbsd
+++ b/client/scripts/netbsd
@@ -38,8 +38,8 @@ if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
   exit 0;
 fi
   
-if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || [ x$reason = xREBIND ];
- then
+if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
                [ x$alias_ip_address != x$old_ip_address ]; then
     ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1
@@ -54,7 +54,7 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || [ x$reason = xREBIND ];
     arp -a | sed -n -e 's/^.*(\(.*\)) at .*$/arp -d \1/p' |sh
   fi
   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-     [ x$reason = xBOUND ]; then
+     [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
     ifconfig $interface inet $new_ip_address $new_subnet_arg \
                                        $new_broadcast_arg $medium
     route add $new_ip_address 127.1 >/dev/null 2>&1