From 01eb73616ded31eb835c655ed0806351714b45bd Mon Sep 17 00:00:00 2001 From: linggao Date: Mon, 11 Apr 2011 13:44:01 +0000 Subject: [PATCH] minor fix for makeroutes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9269 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-client/pods/man8/makeroutes.8.pod | 6 +++--- xCAT-server/lib/xcat/plugins/route.pm | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-client/pods/man8/makeroutes.8.pod b/xCAT-client/pods/man8/makeroutes.8.pod index 97e14e7ce..82be75b07 100644 --- a/xCAT-client/pods/man8/makeroutes.8.pod +++ b/xCAT-client/pods/man8/makeroutes.8.pod @@ -16,7 +16,7 @@ B [B<-h> B<--help>|B<-v>|B<--version>] =head1 DESCRIPTION -The B command adds or deletes routes on the management node or any given nodes. The B specifies the nodes where the routes are to be added or removed. When the I is omitted, the action will be done on the management node. The B<-r> option specifies the name of routes. The details of the routes are defined in the B table which contians the route name, subnet, net mask and gateway. If -r option is omitted, the names of the routes found on B for the nodes or on B for the management node will be used. +The B command adds or deletes routes on the management node or any given nodes. The B specifies the nodes where the routes are to be added or removed. When the I is omitted, the action will be done on the management node. The B<-r> option specifies the name of routes. The details of the routes are defined in the B table which contians the route name, subnet, net mask and gateway. If -r option is omitted, the names of the routes found on B for the nodes or on B for the management node will be used. If you want the routes be automatically setup during node deployment, first put a list of route names to B and then add I script name to the B for the nodes. @@ -36,7 +36,7 @@ Specifies to delete the given routes. If not specified, the action is to add rou =item B<-r|--routename> -Specifies a list of comma separated route names defined in the B table. If omitted, all routes defined in B for nodes or B for the management node will be used. +Specifies a list of comma separated route names defined in the B table. If omitted, all routes defined in B for nodes or B for the management node will be used. =item B<-h|--help> @@ -55,7 +55,7 @@ Command Version. =item 1. -To add all routes from the B to the os route table for the management node. +To add all routes from the B to the os route table for the management node. makeroutes diff --git a/xCAT-server/lib/xcat/plugins/route.pm b/xCAT-server/lib/xcat/plugins/route.pm index 9820c4435..c7bcbd008 100644 --- a/xCAT-server/lib/xcat/plugins/route.pm +++ b/xCAT-server/lib/xcat/plugins/route.pm @@ -354,7 +354,7 @@ sub process_makeroutes { } } else { #this is mn, get the routes from the site table - my @mnroutes = xCAT::Utils->get_site_attribute("routenames"); + my @mnroutes = xCAT::Utils->get_site_attribute("mnroutenames"); if ($mnroutes[0]) { my @a=split(',', $mnroutes[0]); my @badroutes=(); @@ -369,16 +369,16 @@ sub process_makeroutes { my $badroutes_s=join(',', @badroutes); my $rsp={}; if (@badroutes==1) { - $rsp->{error}->[0]= "The route $badroutes_s is not defined in the routes table. Please check site.routenames for the management node."; + $rsp->{error}->[0]= "The route $badroutes_s is not defined in the routes table. Please check site.mnroutenames for the management node."; } else { - $rsp->{error}->[0]= "The routes $badroutes_s are not defined in the routes table. Please check site.routenames for the management node."; + $rsp->{error}->[0]= "The routes $badroutes_s are not defined in the routes table. Please check site.mnroutenames for the management node."; } $callback->($rsp); return 1; } } else { my $rsp={}; - $rsp->{data}->[0]= "No routes defined in the site.routnames for the management node."; + $rsp->{data}->[0]= "No routes defined in the site.mnroutnames for the management node."; $callback->($rsp); return 1; }