From 957403a1d28b1d6f2e1abe0ee2a2c7645c8cc03f Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@cn.ibm.com>
Date: Wed, 6 Nov 2013 17:26:52 +0800
Subject: [PATCH] still fixing bug 3815, dhcp.pm process_request with different
 makedhcp options -n and -a are triggerd by AAsn.pm twice during xcatd
 restarting on SN.  the first -n option is enabled and not get cleanup because
 it is a global variable. and then second call with -a option conficts with -n
 option in last makedhcp context.  we have to clean up -n before call the
 second makedhcp.

---
 xCAT-server/lib/xcat/plugins/AAsn.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index c3ec08da5..824336449 100644
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -582,6 +582,10 @@ sub setup_DHCP
     
     # setup DHCP 
     # 
+
+    # clean up $::opt_n which set by last makedhcp context and conlicts with -a below.
+    undef $::opt_n;
+
     my $modname = "dhcp";
     if ($snonly != 1)  {  # setup  dhcp for all nodes
       $cmdref;