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.

This commit is contained in:
wanghuaz 2013-11-06 17:28:26 +08:00
parent 4ccaef4f22
commit c9c4bca217

View File

@ -582,6 +582,12 @@ 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;