From 0e6d47bac89c1ba30742b6903d53a9f381bdef7c Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 8 Jun 2010 19:55:46 +0000
Subject: [PATCH] changed site attribute dhcpsnonly to disjointdhcps

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6398 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Schema.pm             | 1 +
 xCAT-server/lib/xcat/plugins/dhcp.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index d0b80628e..0c0a7c353 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -671,6 +671,7 @@ site => {
    "                  specify different NICs for different nodes:\n".
    "                       mn|eth1,eth2;service|bond0.\n\n".
    " dhcpsetup:  If set to 'n', it will skip the dhcp setup process in the nodeset cmd.\n\n".
+   " disjointdhcps:  If set to '1', the .leases file on a service node only contains the nodes it manages. The default value is '0'.\n\n".
    " domain:  The DNS domain name used for the cluster.\n\n".
    " forwarders:  The DNS servers at your site that can provide names outside of the\n".
    "              cluster.  The DNS on the management node will forward requests it\n".
diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 156f4a912..b5e87e794 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -457,7 +457,7 @@ sub preprocess_request
     if ($sitetab)
     {
         my $href;
-        ($href) = $sitetab->getAttribs({key => 'dhcpsnonly'}, 'value');
+        ($href) = $sitetab->getAttribs({key => 'disjointdhcps'}, 'value');
         if ($href and $href->{value}) {
 	    $snonly=$href->{value};
 	}