From f6ada0249258f67f9db2d25f75961ae31417f095 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 20 Mar 2008 21:20:06 +0000
Subject: [PATCH] -makedhcp with -a and -d does a more thorough elimination

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@861 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server-2.0/lib/xcat/plugins/dhcp.pm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm b/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
index a05aa74ae..b7b2886cd 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
@@ -264,11 +264,20 @@ sub process_request {
     addnic($_);
   }
   if (grep /^-a$/,@{$req->{arg}}) {
-     $req->{node} = [];
-     my $mactab = xCAT::Table->new('mac');
-     my @entries = ($mactab->getAllNodeAttribs([qw(mac)]));
-     foreach (@entries) {
-        push @{$req->{node}},$_->{node};
+     if (grep /-d$/,@{$req->{arg}}) {
+        $req->{node} = [];
+        my $nodelist = xCAT::Table->new('nodelist');
+        my @entries = ($nodelist->getAllNodeAttribs([qw(node)]));
+        foreach (@entries) {
+         push @{$req->{node}},$_->{node};
+        }
+     } else {
+      $req->{node} = [];
+      my $mactab = xCAT::Table->new('mac');
+      my @entries = ($mactab->getAllNodeAttribs([qw(mac)]));
+      foreach (@entries) {
+           push @{$req->{node}},$_->{node};
+      }
      }
   }