From 5a52416fdb7446c11e55adc73c0c15cf63ae3e85 Mon Sep 17 00:00:00 2001 From: jjhua Date: Fri, 9 Apr 2010 06:55:23 +0000 Subject: [PATCH] libfsp on linux is libfsp.so; pprofile isn't required for a lpar in FSPAPI git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5729 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/PPC.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm index b6cb30844..524c05d10 100644 --- a/xCAT-server/lib/perl/xCAT/PPC.pm +++ b/xCAT-server/lib/perl/xCAT/PPC.pm @@ -1010,7 +1010,9 @@ sub resolve { ################################# foreach my $at ( @attribs ) { if ( !exists( $att->{$at} )) { - return( sprintf( $errmsg{NO_ATTR}, $at, "ppc" )); + if ( $request->{fsp_api} == 1 && $at !~ /^pprofile$/ ) { + return( sprintf( $errmsg{NO_ATTR}, $at, "ppc" )); + } } } ################################# @@ -1638,15 +1640,17 @@ sub check_fsp_api my $request = shift; # my $fsp_api = "/opt/xcat/sbin/fsp-api"; - my $fsp_api = ($::XCATROOT) ? "$::XCATROOT/sbin/fsp-api" : "/opt/xcat/sbin/fsp-api"; - my $libfsp = "/usr/lib/libfsp.a"; + my $fsp_api = ($::XCATROOT) ? "$::XCATROOT/sbin/fsp-api" : "/opt/xcat/sbin/fsp-api"; + #my $libfsp = "/usr/lib/libfsp.a"; + my $libfsp_aix = ($::XCATROOT) ? "$::XCATROOT/lib/libfsp.so" : "/opt/xcat/lib/libfsp.so"; + my $libfsp_linux = ($::XCATROOT) ? "$::XCATROOT/lib/libfsp.a" : "/opt/xcat/lib/libfsp.a"; # my $libfsp = "/opt/xcat/lib/libfsp.a"; # my $libfsp = ($::XCATROOT) ? "$::XCATROOT/lib/libfsp.a" : "/opt/xcat/lib/libfsp.a"; # my $hw_svr = "/opt/csm/csmbin/hdwr_svr"; my $msg = (); # if((-e $fsp_api) && (-x $fsp_api)&& (-e $libfsp) && (-e $hw_svr)) { - if((-e $fsp_api) && (-x $fsp_api)&& (-e $libfsp)) { + if((-e $fsp_api) && (-x $fsp_api)&& ((-e $libfsp_aix) || (-e $libfsp_linux) )) { return 0; }