From ee7d61708b2a596acf2117a1cc9fcd6be2ad8261 Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 6 Apr 2011 08:12:06 +0000
Subject: [PATCH] syntax error

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9233 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/web.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/web.pm b/xCAT-server/lib/xcat/plugins/web.pm
index 127391948..7dc59de1e 100644
--- a/xCAT-server/lib/xcat/plugins/web.pm
+++ b/xCAT-server/lib/xcat/plugins/web.pm
@@ -1111,6 +1111,9 @@ sub web_createimage{
             elsif ('rsct' eq $soft){
                 web_rsctConfigure($ostype, $profile, $osarch, $installdir);
             }
+            elsif('pe' eq $soft){
+                web_peConfigure($ostype, $profile, $osarch, $installdir);
+            }
         }
 
         #chmod 
@@ -1178,10 +1181,11 @@ sub web_createimage{
             print $CONFILE '"ALL","/etc/fstab","tmpfs",,' . "\n";
         }
         close($CONFILE);
-        
+
+        #write the hpc software litefile into temp litefile.csv
         for my $soft (@softArray){
             $soft = lc($soft);
-            if (-e /opt/xcat/share/xcat/IBMhpc/$soft/litefile.csv){
+            if (-e "/opt/xcat/share/xcat/IBMhpc/$soft/litefile.csv"){
                 system ("grep '^[^#]' /opt/xcat/share/xcat/IBMhpc/$soft/litefile.csv >> /tmp/litefile.csv");
             }
         }
@@ -1252,7 +1256,7 @@ sub web_rsctConfigure{
 
     #postinstall
     open($CONFILE, ">>$installdir/custom/netboot/$ostype/$profile.postinstall");
-    print $CONFILE "installroot=\$1 rsctdir=/install/post/otherpkgs/rhels6/ppc64/rsct NODESETSTATE=genimage   /opt/xcat/share/xcat/IBMhpc/rsct/rsct_install\n";
+    print $CONFILE "installroot=\$1 rsctdir=$installdir/post/otherpkgs/rhels6/ppc64/rsct NODESETSTATE=genimage   /opt/xcat/share/xcat/IBMhpc/rsct/rsct_install\n";
     close ($CONFILE);
 }
 
@@ -1289,7 +1293,7 @@ sub web_peConfigure{
     #postinstall
     open($CONFILE, ">>$installdir/custom/netboot/$ostype/$profile.postinstall");
     print $CONFILE "installroot=\$1 NODESETSTATE=genimage   /opt/xcat/share/xcat/IBMhpc/compilers/compilers_license";
-    print $CONFILE "installroot=\$1 pedir=/install/post/otherpkgs/rhels6/ppc64/pe NODESETSTATE=genimage   /opt/xcat/share/xcat/IBMhpc/pe/pe_install";
+    print $CONFILE "installroot=\$1 pedir=$installdir/post/otherpkgs/rhels6/ppc64/pe NODESETSTATE=genimage   /opt/xcat/share/xcat/IBMhpc/pe/pe_install";
     close ($CONFILE);
 }