From 2556112b24d214b3ccc777ba20c2f2e99230f247 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 15 May 2020 11:57:25 -0400
Subject: [PATCH 1/2] Support 'Full' media variant for SLES

SUSE sometimes publishes distro as a single media
---
 xCAT-server/lib/xcat/plugins/sles.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 0eb2e9a4d..ffc5332a0 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -1769,6 +1769,15 @@ sub copycd
                     $distname = "sle15";
                 }
             };
+        } elsif ($dsc =~ /SLE-15/ and $dsc =~ /Full/) {
+            $discnumber = 1;
+            unless ($distname) {
+                if ($dsc =~ /SLE-15-SP(\d)/) {
+                    $distname = "sle15.$1";
+                } else {
+                    $distname = "sle15";
+                }
+            };
         }
     }
 

From ecc26ed6943d03b81a36adaa01b5d810adc407d1 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 11 Nov 2020 11:46:09 -0500
Subject: [PATCH 2/2] Workaround SuSE Full media difference

Profiles written around the initial SuSE15 concept
of 'Installer' and 'Packages' expect Packages in 2.
Workaround by symlinking a 2 when needed.
---
 xCAT-server/lib/xcat/plugins/sles.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index ffc5332a0..dea6643b7 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -1631,6 +1631,7 @@ sub copycd
     #parse the disc info of the os media to get the distribution, arch of the os
     my $discnumber;
     my $darch;
+    my $linktwo = 0;
     if (-r $mntpath . "/content")
     {
         my $dinfo;
@@ -1771,6 +1772,7 @@ sub copycd
             };
         } elsif ($dsc =~ /SLE-15/ and $dsc =~ /Full/) {
             $discnumber = 1;
+	    $linktwo = 1;
             unless ($distname) {
                 if ($dsc =~ /SLE-15-SP(\d)/) {
                     $distname = "sle15.$1";
@@ -1903,6 +1905,7 @@ sub copycd
         rmtree($ospkgpath);
     }
     mkpath("$ospkgpath");
+    if ($linktwo) { symlink("$path/$discnumber", "$path/2"); }
 
     my $omask = umask 0022;
     umask $omask;