From 12f1819180c712a97a9cd23b035a1cf69e068a5a Mon Sep 17 00:00:00 2001
From: lissav <lissav@us.ibm.com>
Date: Thu, 20 Mar 2014 14:22:47 -0400
Subject: [PATCH]  fix defect 3981

---
 xCAT-server/lib/xcat/plugins/AAsn.pm     |  3 +++
 xCAT-server/lib/xcat/plugins/anaconda.pm | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index bb80c11ff..f06ded0b0 100755
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -587,9 +587,11 @@ sub setup_DHCP
     # setup DHCP 
     # 
 
+
     # clean up $::opt_n which set by last makedhcp context and conlicts with -a below.
     undef $::opt_n;
 
+
     my $modname = "dhcp";
     if ($snonly != 1)  {  # setup  dhcp for all nodes
       $cmdref;
@@ -1213,6 +1215,7 @@ sub setup_TFTP
                     push @{$netmethods{$hmhash{$_}->[0]->{netboot}}}, $_;
                 }
             }
+            $::DISABLENODESETWARNING=1;  # stop the warnings about using install/netboot etc
             $cmdref->{command}->[0]  = "nodeset";
             $cmdref->{inittime}->[0] = "1";
             $cmdref->{arg}->[0]      = "enact";
diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 1ed0c468e..278f36b1b 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -257,6 +257,7 @@ sub mknetboot
             my $site_ent = $ents[0];
             if (!defined($site_ent) || ($site_ent =~ /no/i) || ($site_ent =~ /0/))
             {
+               if (!defined($::DISABLENODESETWARNING)) {  # set by AAsn.pm
                 $callback->(
                             {
                              warning => ["The options \"install\", \"netboot\", and \"statelite\" have been deprecated. They should continue to work in this release, but have not been tested as carefully, and some new functions are not available with these options.  For full function and support, use \"nodeset <noderange> osimage=<osimage_name>\" instead."],
@@ -264,6 +265,7 @@ sub mknetboot
                             );
                 # Do not print this warning message multiple times
                 last;
+              }
             }
        }
     }
@@ -930,10 +932,6 @@ sub mknetboot
         );
     }
 
-    #my $rc = xCAT::TableUtils->create_postscripts_tar();
-    #if ( $rc != 0 ) {
-    #	xCAT::MsgUtils->message( "S", "Error creating postscripts tar file." );
-    #}
 }
 
 sub mkinstall
@@ -1001,6 +999,7 @@ sub mkinstall
             my $site_ent = $ents[0];
             if (!defined($site_ent) || ($site_ent =~ /no/i) || ($site_ent =~ /0/))
             {
+               if (!defined($::DISABLENODESETWARNING)) {  # set by AAsn.pm
                 $callback->(
                             {
                              warning => ["The options \"install\", \"netboot\", and \"statelite\" have been deprecated. They should continue to work in this release, but have not been tested as carefully, and some new functions are not available with these options.  For full function and support, use \"nodeset <noderange> osimage=<osimage_name>\" instead."],
@@ -1008,6 +1007,7 @@ sub mkinstall
                             );
                 # Do not print this warning message multiple times
                 last;
+               }
             }
        }
     }
@@ -1577,6 +1577,7 @@ sub mksysclone
             my $site_ent = $ents[0];
             if (!defined($site_ent) || ($site_ent =~ /no/i) || ($site_ent =~ /0/))
             {
+               if (!defined($::DISABLENODESETWARNING)) {  # set by AAsn.pm
                 $callback->(
                             {
                              warning => ["The options \"install\", \"netboot\", and \"statelite\" have been deprecated. They should continue to work in this release, but have not been tested as carefully, and some new functions are not available with these options.  For full function and support, use \"nodeset <noderange> osimage=<osimage_name>\" instead."],
@@ -1584,6 +1585,7 @@ sub mksysclone
                             );
                 # Do not print this warning message multiple times
                 last;
+              }
             }
        }
     }