From 1057bd5b91f3a3a84b543752a115c8cedfa51422 Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Tue, 22 Apr 2014 03:11:09 -0700
Subject: [PATCH] modify DHCP parameters for pkvm

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

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 1a936d5c8..21c5456b9 100755
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2647,6 +2647,7 @@ sub newconfig
     push @dhcpconf, "#xCAT generated dhcp configuration\n";
     push @dhcpconf, "\n";
     push @dhcpconf, "authoritative;\n";
+    push @dhcpconf, "option conf-file code 209 = text;\n";
     push @dhcpconf, "option space isan;\n";
     push @dhcpconf, "option isan-encap-opts code 43 = encapsulate isan;\n";
     push @dhcpconf, "option isan.iqn code 203 = string;\n";
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 073d36fbe..3e44a097d 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -454,11 +454,11 @@ sub process_request {
                   if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
                       $sub_req->({command=>['makedhcp'],
                                   node=> [$node],
-                                  arg=>['-l','-s','conf-file = \"'.$fpath.'\";']},$callback);
+                                  arg=>['-l','-s','option conf-file \"'.$fpath.'\";']},$callback);
                   } else {
                       $sub_req->({command=>['makedhcp'],
                                   node=> [$node],
-                                  arg=>['-s','conf-file = \"'.$fpath.'\";']},$callback);
+                                  arg=>['-s','option conf-file \"'.$fpath.'\";']},$callback);
                   }
               }
           }