Add support for SLES15 SP2

2025-10-31 11:22:27 +00:00 · 2021-03-16 16:08:35 -04:00
parent 7a56cc16f9
commit d464c4fc6c
2 changed files with 4 additions and 0 deletions
--- 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;
--- 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