From 0308e63ef40a059aee6be00bf6ea7095afcf3e7b Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 28 Feb 2013 06:20:30 +0000
Subject: [PATCH] support multiple paths of osimage in sles diskfull
 installation

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

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 9552bacb0..15d507f0b 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -887,8 +887,13 @@ sub mkinstall
         
         #To support multiple paths for osimage.pkgdir. We require the first value of osimage.pkgdir
         # should be the os base pkgdir.
+        my $tmppkgdir=$pkgdir;
         my @srcdirs = split(",", $pkgdir);
         $pkgdir = $srcdirs[0];
+        if( $pkgdir =~/^($installroot\/$os\/$arch)$/) {
+            $srcdirs[0]="$pkgdir/1";
+            $tmppkgdir=join(",", @srcdirs);
+        }
 
         #Call the Template class to do substitution to produce a kickstart file in the autoinst dir
         my $tmperr;
@@ -900,8 +905,8 @@ sub mkinstall
                          "$installroot/autoinst/$node",
                          $node,
 		         $pkglistfile,
-		         $pkgdir,
-                 undef,
+		         $tmppkgdir,
+                 $os,
                  $partfile
                          );
         }