From 6c94b593a0166fd7090e4e0ca6f80336bb3eb94a Mon Sep 17 00:00:00 2001 From: ligc Date: Tue, 9 Mar 2010 11:36:23 +0000 Subject: [PATCH] fix for bug 2961809: rnetboot for Linux node should not print nimnodeset information git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5417 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPboot.pm | 2 +- perl-xCAT/xCAT/PPCboot.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/FSPboot.pm b/perl-xCAT/xCAT/FSPboot.pm index ce32e1428..27c30f6aa 100644 --- a/perl-xCAT/xCAT/FSPboot.pm +++ b/perl-xCAT/xCAT/FSPboot.pm @@ -248,7 +248,7 @@ sub rnetboot { my $chaintab = xCAT::Table->new('chain'); my $vcon = $chaintab->getAttribs({ node => "$node"}, 'currstate'); if ( $vcon and $vcon->{"currstate"} and $vcon->{"currstate"} eq "boot" ) { - return( [[$node,"Node is in boot state. Use nimnodeset command before rnetboot or -F option to forcely reinitialize",RC_ERROR]] ); + return( [[$node,"Node is in boot state. Use nodeset command before rnetboot or use -F option with rnetboot",RC_ERROR]] ); } } diff --git a/perl-xCAT/xCAT/PPCboot.pm b/perl-xCAT/xCAT/PPCboot.pm index a0c067452..1e80eb09c 100644 --- a/perl-xCAT/xCAT/PPCboot.pm +++ b/perl-xCAT/xCAT/PPCboot.pm @@ -323,7 +323,7 @@ sub rnetboot { my $chaintab = xCAT::Table->new('chain'); my $vcon = $chaintab->getAttribs({ node => "$node"}, 'currstate'); if ( $vcon and $vcon->{"currstate"} and $vcon->{"currstate"} eq "boot" ) { - return( [[$node,"Node is in boot state. Use nimnodeset command before rnetboot or -F option to forcely reinitialize",RC_ERROR]] ); + return( [[$node,"Node is in boot state. Use nodeset command before rnetboot or use -F option with rnetboot",RC_ERROR]] ); } }