From 392fc1b3cbb8ed8625d727cc5acf2f0be03273b0 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Fri, 7 Nov 2014 03:00:38 -0500 Subject: [PATCH] fix bug 4368 mkvm for lpars in different CECs will failed --- perl-xCAT/xCAT/FSPvm.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/FSPvm.pm b/perl-xCAT/xCAT/FSPvm.pm index 45e5bfc4f..b31b4e942 100644 --- a/perl-xCAT/xCAT/FSPvm.pm +++ b/perl-xCAT/xCAT/FSPvm.pm @@ -422,7 +422,7 @@ sub chvm_parse_args { my $check_chvm_arg = chvm_parse_extra_options(\@ARGV, \%opt); if (defined($check_chvm_arg)) { return (usage("Invalid argument: $check_chvm_arg")); - } elsif (($opt{lparname} ne '*') && (scalar(@{$request->{node}}) > '1')){ + } elsif (($opt{lparname}) && ($opt{lparname} ne '*') && (scalar(@{$request->{node}}) > '1')){ return(usage( "Invalid argument: must specify '*' for more than one node" )); } if ((exists($opt{lparname}) ||exists($opt{huge_page})) && @@ -615,7 +615,6 @@ sub mkvm_parse_args { if ( (!exists( $opt{i} ) || !exists( $opt{r} )) ) { return(usage()); } - } $opt{target} = \@{$request->{node}}; my $ppctab = xCAT::Table->new( 'ppc'); unless($ppctab) { @@ -640,9 +639,11 @@ sub mkvm_parse_args { return(usage("For Power 775, please make sure the noderange are in one CEC ")); } } - if (exists($opt{p775})) { + #if (exists($opt{p775})) { $request->{node} = [$other_p]; $request->{noderange} = $other_p; + #} + } #################################### # No operands - add command name