From 55530c5ae0cd5e4b519bfaa4300d50c704c70fab Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 30 Mar 2010 04:13:18 +0000
Subject: [PATCH] change the warning message for nodeadd,mkdef,chdef add node
 name with capitcal letter

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5602 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 4 ++--
 xCAT-server/lib/xcat/plugins/tabutils.pm     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 158f9d5d6..6109afc16 100644
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -903,7 +903,7 @@ sub defmk
         if ($invalidnodename) {
             $invalidnodename =~ s/,//;
             my $rsp;
-            $rsp->{data}->[0] = "The node name \'$invalidnodename\' has capital which can not be resolved correctly by dns server. Please don't use the capital in the node name which need to be installed Operating System.";
+            $rsp->{data}->[0] = "The node name \'$invalidnodename\' contains capital letters which may not be resolved correctly by the dns server.";
             xCAT::MsgUtils->message("W", $rsp, $::callback);
         }
     }
@@ -2123,7 +2123,7 @@ sub defch
                 if ($invalidnodename) {
                     $invalidnodename =~ s/,//;
                     my $rsp;
-                    $rsp->{data}->[0] = "The node name \'$invalidnodename\' has capital which can not be resolved correctly by dns server. Please don't use the capital in the node name which need to be installed Operating System.";
+                    $rsp->{data}->[0] = "The node name \'$invalidnodename\' contains capital letters which may not be resolved correctly by the dns server.";
                     xCAT::MsgUtils->message("W", $rsp, $::callback);
                 }
    
diff --git a/xCAT-server/lib/xcat/plugins/tabutils.pm b/xCAT-server/lib/xcat/plugins/tabutils.pm
index 4d9d6b417..9c5fb767b 100644
--- a/xCAT-server/lib/xcat/plugins/tabutils.pm
+++ b/xCAT-server/lib/xcat/plugins/tabutils.pm
@@ -787,7 +787,7 @@ sub nodech
         }
         if ($invalidnodename) {
             $invalidnodename =~ s/,//;
-            $callback->( {warning => "The node name \'$invalidnodename\' has capital which can not be resolved correctly by dns server. Please don't use the capital in the node name which need to be installed Operating System.\n"} );
+            $callback->( {warning => "The node name \'$invalidnodename\' contains capital letters which may not be resolved correctly by the dns server."} );
         }
     } elsif ($groupmode) {
         @groups = split /,/, shift @ARGV;