From d87440ec41111d80cd56cc97f0355b032a861bc8 Mon Sep 17 00:00:00 2001 From: Jia Zhao Date: Thu, 28 Aug 2014 17:27:15 +0800 Subject: [PATCH] merge from 2.8 branch about name mistake --- xCAT-server/lib/xcat/plugins/profilednodes.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm index 846111e0e..59011633c 100644 --- a/xCAT-server/lib/xcat/plugins/profilednodes.pm +++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm @@ -2305,10 +2305,10 @@ sub validate_node_entry{ } # Must specify either MAC, CEC or switch + port. if (exists $node_entry{"mac"} || - exists $node_entry{"switch"} && exists $node_entry{"switchport"} || + exists $node_entry{"switches"} || exists $node_entry{"cec"}){ } else{ - $errmsg .= "MAC address, cec, switch and port is not specified. You must specify the MAC address, CEC name or switch and port.\n"; + $errmsg .= "MAC address, cec, switches is not specified. You must specify the MAC address, CEC name or switches.\n"; } if (! xCAT::NetworkUtils->isValidHostname($node_name)){