From 7850b36aa24305596b70b6537510705149a26909 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 24 Mar 2009 19:44:23 +0000
Subject: [PATCH] changed setting from nonodestatus to nodestatus :-)

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2972 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Schema.pm                | 2 +-
 xCAT-server/lib/perl/xCAT/PPC.pm        | 4 ++--
 xCAT-server/lib/xcat/plugins/blade.pm   | 4 ++--
 xCAT-server/lib/xcat/plugins/destiny.pm | 4 ++--
 xCAT-server/lib/xcat/plugins/ipmi.pm    | 4 ++--
 xCAT-server/lib/xcat/plugins/kvm.pm     | 4 ++--
 xCAT-server/lib/xcat/plugins/xen.pm     | 4 ++--
 xCAT/postscripts/xcataixpost            | 4 ++--
 xCAT/postscripts/xcatdsklspost          | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 8e67b1be5..8d62241f6 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -532,7 +532,7 @@ site => {
    "  master:\tThe hostname of the xCAT management node.\n\n".
    "  maxssh:\tThe max # of SSH connections for hw ctrl purposes to PPC hw.\n\n".
    "  nameservers:\tA comma delimited list of DNS servers for the cluster - often the xCAT management node.\n\n".
-   "  nonodestatus:\tIf set to 1, the nodelist.status column will not be updated during the node deployment, node discovery and power operation.\n\n".
+   "  nodestatus:\tIf set to 0, the nodelist.status column will not be updated during the node deployment, node discovery and power operation.\n\n".
    "  ntpservers:\tA comma delimited list of NTP servers for the cluster - often the xCAT management node.\n\n".
    "  ppcmaxp:\tThe max # of processes for PPC hw ctrl.\n\n".
    "  ppcretry:\tThw max # of PPC hw connection attempts before failing.\n\n".
diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm
index 177e2822b..7822d4bd0 100644
--- a/xCAT-server/lib/perl/xCAT/PPC.pm
+++ b/xCAT-server/lib/perl/xCAT/PPC.pm
@@ -129,9 +129,9 @@ sub process_command {
   my $newstat;
   my $global_check=1;
   if ($sitetab) {
-    (my $ref) = $sitetab->getAttribs({key => 'nonodestatus'}, 'value');
+    (my $ref) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
     if ($ref and $ref->{value}) {
-       if ($ref->{value} =~ /1|y|Y/) { $global_check=0; }
+       if ($ref->{value} =~ /0|n|N/) { $global_check=0; }
     }
   }
 
diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 1b89d1297..8f26993e9 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -2829,9 +2829,9 @@ sub dompa {
   my $global_check=1;
   my $sitetab = xCAT::Table->new('site');
   if ($sitetab) {
-    (my $ref) = $sitetab->getAttribs({key => 'nonodestatus'}, 'value');
+    (my $ref) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
     if ($ref and $ref->{value}) {
-       if ($ref->{value} =~ /1|y|Y/) { $global_check=0; }
+       if ($ref->{value} =~ /0|N|n/) { $global_check=0; }
     }
   }
 
diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
index 7a8de3d6c..fa0205cb4 100644
--- a/xCAT-server/lib/xcat/plugins/destiny.pm
+++ b/xCAT-server/lib/xcat/plugins/destiny.pm
@@ -28,9 +28,9 @@ my $tftpdir="/tftpboot";
 my $nonodestatus=0;
 my $sitetab = xCAT::Table->new('site');
 if ($sitetab) {
-    (my $ref1) = $sitetab->getAttribs({key => 'nonodestatus'}, 'value');
+    (my $ref1) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
     if ($ref1 and $ref1->{value}) {
-	if ($ref1->{value} =~ /1|y|Y/) { $nonodestatus=1; }
+	if ($ref1->{value} =~ /0|n|N/) { $nonodestatus=1; }
     }
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index b7c94d73d..5f4c2c81f 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -5882,9 +5882,9 @@ sub process_request {
   my $newstat;
   my $global_check=1;
   if ($sitetab) {
-    (my $ref) = $sitetab->getAttribs({key => 'nonodestatus'}, 'value');
+    (my $ref) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
     if ($ref and $ref->{value}) {
-       if ($ref->{value} =~ /1|y|Y/) { $global_check=0; }
+       if ($ref->{value} =~ /0|n|N/) { $global_check=0; }
     }
   }
  
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index ba2391668..58f9c8027 100644
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -896,9 +896,9 @@ sub process_request {
   my $newstat;
   my $global_check=1;
   if ($sitetab) {
-    (my $ref) = $sitetab->getAttribs({key => 'nonodestatus'}, 'value');
+    (my $ref) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
     if ($ref and $ref->{value}) {
-       if ($ref->{value} =~ /1|y|Y/) { $global_check=0; }
+       if ($ref->{value} =~ /0|n|N/) { $global_check=0; }
     }
   }
 
diff --git a/xCAT-server/lib/xcat/plugins/xen.pm b/xCAT-server/lib/xcat/plugins/xen.pm
index d4a99c11d..da301a130 100644
--- a/xCAT-server/lib/xcat/plugins/xen.pm
+++ b/xCAT-server/lib/xcat/plugins/xen.pm
@@ -757,9 +757,9 @@ sub process_request {
   my $global_check=1;
   my $sitetab = xCAT::Table->new('site');
   if ($sitetab) {
-    (my $ref) = $sitetab->getAttribs({key => 'nonodestatus'}, 'value');
+    (my $ref) = $sitetab->getAttribs({key => 'nodestatus'}, 'value');
     if ($ref and $ref->{value}) {
-       if ($ref->{value} =~ /1|y|Y/) { $global_check=0; }
+       if ($ref->{value} =~ /0|n|N/) { $global_check=0; }
     }
   }
 
diff --git a/xCAT/postscripts/xcataixpost b/xCAT/postscripts/xcataixpost
index cc10334c6..40c8b8c23 100755
--- a/xCAT/postscripts/xcataixpost
+++ b/xCAT/postscripts/xcataixpost
@@ -142,8 +142,8 @@ if (-f $scriptname)
 if (@ARGV<1) {
   my $update=1;
   if (-f $scriptname) {
-      my $CNS=`grep NONODESTATUS= $scriptname`;
-      if ((!$?) && ($CNS =~ /\'1\'|\'Y\'|\'y\'/)) { $update=0;}  #only update is nonodestatus is not set in the site table
+      my $CNS=`grep NODESTATUS= $scriptname`;
+      if ((!$?) && ($CNS =~ /\'0\'|\'N\'|\'n\'/)) { $update=0;}  #only update is nonodestatus is not set in the site table
   }
   if ($update) {
       if (&updateflag($nodesetstat) != 0) {
diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index 7d56c9135..197660af0 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -94,8 +94,8 @@ fi
 
 if [ $# -eq 0 ]; then
   #notify the server that we are done with netbooting
-  CNS=`grep NONODESTATUS= /tmp/mypostscript |awk -F = '{print $2}'`
-  if [ -z "$CNS" ] || [ $CNS != "'1'" -a   $CNS != "'Y'"  -a  $CNS != "'y'" ]; then
+  CNS=`grep NODESTATUS= /tmp/mypostscript |awk -F = '{print $2}'`
+  if [ -z "$CNS" ] || [ $CNS != "'0'" -a   $CNS != "'N'"  -a  $CNS != "'n'" ]; then
       echo "updateflag.awk \$MASTER 3002 \"installstatus booted\"" >> /tmp/mypostscript
   fi
 fi