diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.exlist similarity index 100% rename from xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.exlist rename to xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.exlist diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist similarity index 84% rename from xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist index eff8db2ca..69005ad16 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist @@ -1,5 +1,5 @@ # OS packages that are useful for all IBM HPC products -#INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist# xinetd rsh diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.pkglist deleted file mode 100755 index 7ae28ade6..000000000 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.pkglist +++ /dev/null @@ -1,3 +0,0 @@ -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.rhel6.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.rhel6.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.exlist similarity index 81% rename from xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.exlist rename to xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.exlist index 2468ac752..2f692eaae 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.exlist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.exlist @@ -1,4 +1,4 @@ -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.exlist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.exlist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist similarity index 100% rename from xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.otherpkgs.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist new file mode 100755 index 000000000..073905a1a --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist @@ -0,0 +1,3 @@ +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.rhels6.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.rhels6.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall similarity index 95% rename from xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.postinstall rename to xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall index 26d83f5e3..8d5e83aa0 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhel6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall @@ -24,7 +24,7 @@ otherpkgs=/install/post/otherpkgs/$osver/$arch # Run default postinstall shipped with xcat -/opt/xcat/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall $1 $2 $3 $4 $5 +/opt/xcat/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall $1 $2 $3 $4 $5 # Run general IBMhpc postinstall script diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.cleanup b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup similarity index 100% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.cleanup rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.exlist similarity index 100% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.exlist rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.exlist diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.pkglist similarity index 84% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.pkglist index 88f6a7c75..104975154 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.pkglist @@ -1,5 +1,5 @@ # OS packages that are useful for all IBM HPC products -#INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist# xinetd rsh diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.exlist similarity index 87% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.exlist rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.exlist index 73b7114f8..419b4aab0 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.exlist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.exlist @@ -1,7 +1,7 @@ # Sample exlude list for building a diskless RHEL6 PPC64 image #INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.exlist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.exlist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/min-essl.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/min-gpfs.exlist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist similarity index 100% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.otherpkgs.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.pkglist similarity index 74% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.pkglist rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.pkglist index 315987909..cc94c2677 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.pkglist @@ -1,8 +1,8 @@ # Sample package list for installing all IBM HPC products in a # RHEL6 ppc64 minimal diskless image -#not INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist# +#not INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/min-IBMhpc.rhels6.ppc64.pkglist# #not INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/min-compilers.pkglist# #not INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/min-essl.pkglist# #not INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/min-loadl.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall similarity index 92% rename from xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.postinstall rename to xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall index 357aacb4f..e51833ed5 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhel6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall @@ -24,7 +24,7 @@ otherpkgs=/install/post/otherpkgs/$osver/$arch # Run default postinstall shipped with xcat -/opt/xcat/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall $1 $2 $3 $4 $5 +/opt/xcat/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall $1 $2 $3 $4 $5 # Run general IBMhpc postinstall script @@ -57,5 +57,5 @@ installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/ installroot=$installroot rsctdir=$otherpkgs/rsct NODESETSTATE=genimage $hpc/rsct/rsct_install #clean up -$hpc/min-IBMhpc.rhel6.cleanup $1 $2 $3 $4 $5 +$hpc/min-IBMhpc.rhels6.cleanup $1 $2 $3 $4 $5