From 254cf2b2bfe44f23a453c2da753c2e55b6f924f0 Mon Sep 17 00:00:00 2001
From: Bin Xu <robin.hsu@163.com>
Date: Mon, 28 Aug 2017 17:07:20 +0800
Subject: [PATCH] Fix 3787, code error when missing -l option for makedhcp in
 nodeset (#3788)

---
 xCAT-server/lib/xcat/plugins/grub2.pm     | 2 +-
 xCAT-server/lib/xcat/plugins/petitboot.pm | 2 +-
 xCAT-server/lib/xcat/plugins/xnba.pm      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index 03482eeb4..4f72eb452 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -816,7 +816,7 @@ sub process_request {
                 if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
                     xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: issue makedhcp request");
                     $sub_req->({ command => ['makedhcp'],
-                            node => \@{ $osimagenodehash{$osimage} } }, $callback);
+                            node => \@{ $osimagenodehash{$osimage} }, arg => ['-l'] }, $callback);
                 } else {
                     xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: issue makedhcp request");
                     $sub_req->({ command => ['makedhcp'],
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index af3320ae2..c6c9c7295 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -656,7 +656,7 @@ sub process_request {
         }
         if ($do_dhcpsetup) {
             my @parameter;
-            push @parameter, '-l' if ($::request->{'_disparatetftp'}->[0]);
+            push @parameter, '-l' if ($request->{'_disparatetftp'}->[0]);
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue makedhcp request");
 
             $sub_req->({ command => ['makedhcp'],
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 7250f1b6c..1bccc87b9 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -711,7 +711,7 @@ sub process_request {
         }
         if ($do_dhcpsetup) {
             my @parameter;
-            push @parameter, '-l' if ($::request->{'_disparatetftp'}->[0]);
+            push @parameter, '-l' if ($::XNBA_request->{'_disparatetftp'}->[0]);
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue makedhcp request");
 
             $sub_req->({ command => ['makedhcp'],