From d464c4fc6c1365ee9f2b13dcf91183d9ff56f841 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 16 Mar 2021 16:08:35 -0400
Subject: [PATCH] Add support for SLES15 SP2

---
 xCAT-server/lib/perl/xCAT/Template.pm                     | 3 +++
 xCAT-server/share/xcat/install/sles/compute.sle15.pkglist | 1 +
 2 files changed, 4 insertions(+)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 0da104fa0..bbfec6d95 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -342,6 +342,9 @@ sub subvars {
                             $product_dir=$subdir;
                             if($subdir =~ /^Module-/){
                                 $product_name="sle-".lc($subdir);
+                            }elsif($subdir =~ /^Product-SUSE-Manager-Server|^Product-SLES_SAP/){
+                                # Skip product directories that are not "SLES", causes conflict on SLE15.2
+                                next;
                             }elsif($subdir =~ /^Product-/){
                                 $subdir=~s/Product-//;
                                 $product_name=$subdir;
diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
index 1e72952ac..9fee9c520 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
+++ b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
@@ -6,3 +6,4 @@ insserv-compat
 net-tools-deprecated
 rsyslog
 nfs-client
+wget