arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bugs for bugs item 3316413 and 3316669

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9857 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao
2011-06-20 09:12:38 +00:00
parent 7f95eb0953
commit ccf2a60970
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
perl-xCAT/xCAT/FSPvm.pm
View File

@@ -201,13 +201,16 @@ sub chvm_parse_args {
my @elems = split(/\,/,$opt{r});
my $range="";
while (my $elem = shift @elems) {
if ($elem !~ /\:/) {
return (usage("Invalid argument $elem.\n The input format for 'r' should be like this: \"-r Octant_id:Value\"."))
}
if($elem !~ /\-/) {
my @subelems = split(/\:/, $elem);
if( $subelems[0] < 0 || $subelems[0] > 7) {
return(usage("Octant ID only could be 0 to 7 in the octant configuration value $elem"));
}
if( grep(/^$subelems[1]$/, @ratio ) != 1) {
return(usage( "Invalid octant configuration value in $elem.\n For P7 IH, octant configuration values only could be 1, 2, 3, 4, 5. Please see the details in manpage of mkvm." ));
return(usage( "Invalid octant configuration value in $elem.\n For P7 IH, octant configuration values only could be 1, 2, 3, 4, 5. Please see the details in manpage of chvm." ));
}
if( exists($octant_cfg{$subelems[0]}) && $octant_cfg{$subelems[0]} == $subelems[1] ) {
return(usage("In the octant configuration rule, same octant with different octant configuration value. Error!"));
@@ -222,7 +225,7 @@ sub chvm_parse_args {
}
if($left == $right) {
if( grep(/^$subelems[1]$/, @ratio ) != 1) {
return(usage( "Invalid octant configuration value in $elem.\n For P7 IH, octant configuration values only could be 1, 2, 3, 4, 5. Please see the details in manpage of mkvm." ));
return(usage( "Invalid octant configuration value in $elem.\n For P7 IH, octant configuration values only could be 1, 2, 3, 4, 5. Please see the details in manpage of chvm." ));
}
if( exists($octant_cfg{$left}) || $octant_cfg{$left} == $subelems[1] ) {
return(usage("In the octant configuration rule, same octant with different octant configuration value. Error!"));
@@ -579,6 +582,7 @@ sub modify {
my $hash = shift;
return modify_by_prof( $request, $hash) if ( $request->{opt}->{p});
return create( $request, $hash) if ( $request->{opt}->{i});
return ([["Error", "Miss argument"]]);
}

2
xCAT-client/pods/man1/rspconfig.1.pod
View File

@@ -157,7 +157,7 @@ B<rspconfig> I<noderange> B<--resetnet>
B<rspconfig> configures various settings in the nodes' service processors. If only a keyword is
specified, without the B<=>, it displays the current value.
For options B<autopower>|B<iocap>|B<dev>|B<celogin1>|B<decfg>|B<memdecfg>|B<procdecfg>|B<time>|B<date>|B<spdump>|B<sysdump>|B<network>, user need to use I<chdef -t site enableASMI=yes> to enable ASMI first, then access I<http://w3.pok.ibm.com/organization/prodeng/pw/> to get the dynamic password for 'celogin' and put it in passwd table. After completed the command, user should use I<chdef -t site enableASMI=no> to disable ASMI.
For options B<autopower>|B<iocap>|B<dev>|B<celogin1>|B<decfg>|B<memdecfg>|B<procdecfg>|B<time>|B<date>|B<spdump>|B<sysdump>|B<network>, user need to use {I<chdef -t site enableASMI=yes>} to enable ASMI first, then access I<http://w3.pok.ibm.com/organization/prodeng/pw/> to get the dynamic password for 'celogin' and put it in passwd table. After completed the command, user should use {I<chdef -t site enableASMI=no>} to disable ASMI.
=head1 OPTIONS