From 0d3e2997603bbc87b5366a91ca55fc8257cb692f Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 27 Oct 2010 19:27:38 +0000
Subject: [PATCH] Shorten the autoyast/kickstart template name because the vmur
 module cannot punch a parm file to reader if the length on a line is greater
 than 80 characters.

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

diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 08982edfe..10ffa01d3 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -3095,7 +3095,7 @@ sub nodeSet {
 			$out = `mkdir -p $installDir/custom/install/sles`;
 
 			# Copy autoyast template
-			$customTmpl = "$installDir/custom/install/sles/" . $node . "." . $tmpl;
+			$customTmpl = "$installDir/custom/install/sles/" . $node . "." . $profile . ".tmpl";
 			if ( -e "$installDir/custom/install/sles/$tmpl" ) {
 				$out = `cp $installDir/custom/install/sles/$tmpl $customTmpl`;
 			}
@@ -3151,7 +3151,7 @@ sub nodeSet {
 			#	Install=ftp://10.0.0.1/sles10.2/s390x/1/
 			#	UseVNC=1  VNCPassword=12345678
 			#	InstNetDev=osa OsaInterface=qdio OsaMedium=eth Manual=0
-			my $ay = "ftp://$ftp/custom/install/sles/" . $node . "." . $tmpl;
+			my $ay = "ftp://$ftp/custom/install/sles/" . $node . "." . $profile . ".tmpl";
 
 			$parms = $parmHeader . "\n";
 			$parms = $parms . "AutoYaST=$ay\n";
@@ -3230,7 +3230,7 @@ sub nodeSet {
 			$out = `mkdir -p $installDir/custom/install/rh`;
 
 			# Copy kickstart template
-			$customTmpl = "$installDir/custom/install/rh/" . $node . "." . $tmpl;
+			$customTmpl = "$installDir/custom/install/rh/" . $node . "." . $profile . ".tmpl";
 			if ( -e "$installDir/custom/install/rh/$tmpl" ) {
 				$out = `cp $installDir/custom/install/rh/$tmpl $customTmpl`;
 			}
@@ -3293,7 +3293,7 @@ sub nodeSet {
 			#	GATEWAY=10.0.0.1 DNS=9.0.2.11 MTU=1500
 			#	PORTNAME=UNASSIGNED PORTNO=0 LAYER2=0
 			#	vnc vncpassword=12345678
-			my $ks = "ftp://$ftp/custom/install/rh/" . $node . "." . $tmpl;
+			my $ks = "ftp://$ftp/custom/install/rh/" . $node . "." . $profile . ".tmpl";
 
 			$parms = $parmHeader . "\n";
 			$parms = $parms . "ks=$ks\n";