From 217641cf2ba379021d69dc01793f5cc7e9c209ea Mon Sep 17 00:00:00 2001 From: sakolish Date: Wed, 13 Feb 2008 19:26:13 +0000 Subject: [PATCH] Changed nodetype attribute to accept "lpar,osi" - Line #340 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@467 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT-2.0/xCAT/PPC.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/perl-xCAT-2.0/xCAT/PPC.pm b/perl-xCAT-2.0/xCAT/PPC.pm index b9424755e..42658e78d 100644 --- a/perl-xCAT-2.0/xCAT/PPC.pm +++ b/perl-xCAT-2.0/xCAT/PPC.pm @@ -336,11 +336,12 @@ sub resolve { ################################# # Check for valid "type" ################################# - if ( $ent->{nodetype} !~ /^fsp|bpa|osi$/ ) { + my @types = split /,/, $ent->{nodetype}; + my ($type) = grep( /^fsp|bpa|osi|lpar$/, @types ); + + if ( !defined( $type )) { return( "Invalid node type: $ent->{nodetype}" ); } - my $type = $ent->{nodetype}; - ################################# # Get attributes ################################# @@ -352,7 +353,7 @@ sub resolve { ################################# # Special lpar processing ################################# - if ( $type =~ /^osi$/ ) { + if ( $type =~ /^lpar|osi$/ ) { $att->{bpa} = 0; $att->{type} = "lpar"; $att->{node} = $att->{parent}; @@ -712,3 +713,4 @@ sub process_request { +