From c0c737b26cd4b1b55014cd1626c12e8fcea01fa2 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 7 Aug 2012 16:41:12 +0000
Subject: [PATCH]  use noderangecontainsMn routine

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

diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index 453474a14..8f7403f4d 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -973,23 +973,13 @@ $AIXnodes_nd, $subreq  ) != 0 ) {
     if ($request->{security} && $request->{security}->[0] eq "yes") {
        # check to see if the Management Node is in the noderange and
        # if it is abort
-        my $mname;
-        my $tab = xCAT::Table->new('nodetype');
-        my @nodelist2=$tab->getAllNodeAttribs(['node','nodetype']);
-        foreach my $n (@nodelist2) {
-           if ($n->{'nodetype'} eq "mn") {  # this is the MN
-              $mname=$n->{'node'};
-              last;
-           }
-        }
-        if ($mname) {  # MN in the database
-         if (grep(/$mname/, @$nodes)) { # if MN in the noderange
+       my $mname = xCAT::Utils->noderangecontainsMn(@$nodes);
+       if ($mname) {  # MN in the nodelist
             my $rsp = {};
             $rsp->{error}->[0] =
               "You must not run -K option against the Management Node:$mname.";
             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
             return;
-         }
         }
          
         # generate the arguments