From 33c5c3cae17e79a9a1e31df63021608c72aa7496 Mon Sep 17 00:00:00 2001
From: yangsbj <yangsbj@cn.ibm.com>
Date: Thu, 24 Jan 2019 04:16:24 -0500
Subject: [PATCH] fix issue nodeset calculate wrong path for deploying sles
 when using "copycds -p" #5966

---
 xCAT-server/lib/xcat/plugins/sles.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 79487429e..7054fb6b3 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -937,14 +937,12 @@ sub mkinstall
 
         # trim the "/" in /install/sles11.3/x86_64/
         $pkgdir =~ s/\/$//;
-        if ($pkgdir =~ /^($installroot\/$os\/$arch)$/) {
-            if ( -d "$pkgdir/2") {
-                $srcdirs[0] = "$pkgdir/1,$pkgdir/2";
-            }else{
-                $srcdirs[0] = "$pkgdir/1";
-            }
-            $tmppkgdir = join(",", @srcdirs);
+        if ( -d "$pkgdir/2") {
+            $srcdirs[0] = "$pkgdir/1,$pkgdir/2";
+        }else{
+            $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;