From: Ted Lemon <source@isc.org>
Date: Wed, 5 Mar 1997 08:38:20 +0000 (+0000)
Subject: behave differently if we got a renewal via INIT-REBOOT
X-Git-Tag: DHCP-970305A~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77967680f88a3c59d82d75680bbc7ea86f9bec60;p=thirdparty%2Fdhcp.git

behave differently if we got a renewal via INIT-REBOOT
---

diff --git a/client/dhclient.c b/client/dhclient.c
index 4f81b3a19..a0c4dfd16 100644
--- 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 c734ef8eb..01d82f120 100755
--- 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