From 0afc3ecb55408dbf47eb1891fe2491c2ec318a75 Mon Sep 17 00:00:00 2001 From: xq2005 Date: Tue, 28 Sep 2010 04:59:46 +0000 Subject: [PATCH] /install is hard coded git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7695 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPUtils.pm | 3 ++- perl-xCAT/xCAT/InstUtils.pm | 3 ++- perl-xCAT/xCAT/PPCrflash.pm | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm index 0c858873f..c268857c7 100644 --- a/perl-xCAT/xCAT/FSPUtils.pm +++ b/perl-xCAT/xCAT/FSPUtils.pm @@ -111,8 +111,9 @@ sub fsp_api_action { #print "fsp ip: $fsp_ip\n"; my $cmd; + my $install_dir = xCAT::Utils->getInstallDir(); if( $action =~ /^code_update$/) { - $cmd = "$fsp_api -a $action -T $tooltype -t $type:$fsp_ip:$id:$node_name: -d /install/packages_fw/"; + $cmd = "$fsp_api -a $action -T $tooltype -t $type:$fsp_ip:$id:$node_name: -d $install_dir/packages_fw/"; } elsif($action =~ /^add_connection$/) { my $ppcdirecttab = xCAT::Table->new( 'ppcdirect'); if ( ! $ppcdirecttab) { diff --git a/perl-xCAT/xCAT/InstUtils.pm b/perl-xCAT/xCAT/InstUtils.pm index c239ee17f..2ef53dfec 100644 --- a/perl-xCAT/xCAT/InstUtils.pm +++ b/perl-xCAT/xCAT/InstUtils.pm @@ -1046,7 +1046,8 @@ sub dolitesetup # add aixlitesetup to ..inst_root/aixlitesetup # this will wind up in the root dir on the node ("/") - my $cpcmd = "/bin/cp /install/postscripts/aixlitesetup $instrootloc/aixlitesetup; chmod +x $instrootloc/aixlitesetup"; + my $install_dir = xCAT::Utils->getInstallDir(); + my $cpcmd = "/bin/cp $install_dir/postscripts/aixlitesetup $instrootloc/aixlitesetup; chmod +x $instrootloc/aixlitesetup"; my $out = xCAT::Utils->runcmd("$cpcmd", -1); if ($::RUNCMD_RC != 0) { diff --git a/perl-xCAT/xCAT/PPCrflash.pm b/perl-xCAT/xCAT/PPCrflash.pm index 870a5b9dd..3fefc77f1 100644 --- a/perl-xCAT/xCAT/PPCrflash.pm +++ b/perl-xCAT/xCAT/PPCrflash.pm @@ -269,7 +269,8 @@ sub preprocess_for_rflash { my $request = shift; my $opt = shift; my $callback = $request->{callback}; - my $packages_fw = "/install/packages_fw"; + my $install_dir = xCAT::Utils->getInstallDir(); + my $packages_fw = "$install_dir/packages_fw"; my $c = 0; my $packages_d; # foreach (@$exargs) {