From cba331e84739b374909b0c7f021fce220e372e3f Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 2 Apr 2019 09:43:53 -0400
Subject: [PATCH 1/4] Correct hwclock in other SLE xml

---
 xCAT-server/share/xcat/install/sles/service.sle15.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.tmpl b/xCAT-server/share/xcat/install/sles/service.sle15.tmpl
index e75529258..b1ed324ea 100644
--- a/xCAT-server/share/xcat/install/sles/service.sle15.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sle15.tmpl
@@ -12,7 +12,7 @@
     </bootloader>
     <general>
       <clock>
-        <hwclock>GMT</hwclock>
+        <hwclock>UTC</hwclock>
         <timezone>#TABLE:site:key=timezone:value#</timezone>
       </clock>
       <keyboard>

From a9a0145f8c72b0d3ce9e23404e1f20068c9c714e Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 2 Apr 2019 09:50:46 -0400
Subject: [PATCH 2/4] Change more SLE to UTC from GMT

---
 xCAT-server/share/xcat/install/sles/compute.sles12.tmpl | 2 +-
 xCAT-server/share/xcat/install/sles/service.sles12.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
index bf5a3764a..7062fedaa 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
@@ -12,7 +12,7 @@
     </bootloader>
     <general>
       <clock>
-        <hwclock>GMT</hwclock>
+        <hwclock>UTC</hwclock>
         <timezone>#TABLE:site:key=timezone:value#</timezone>
       </clock>
       <keyboard>
diff --git a/xCAT-server/share/xcat/install/sles/service.sles12.tmpl b/xCAT-server/share/xcat/install/sles/service.sles12.tmpl
index bf5a3764a..7062fedaa 100644
--- a/xCAT-server/share/xcat/install/sles/service.sles12.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles12.tmpl
@@ -12,7 +12,7 @@
     </bootloader>
     <general>
       <clock>
-        <hwclock>GMT</hwclock>
+        <hwclock>UTC</hwclock>
         <timezone>#TABLE:site:key=timezone:value#</timezone>
       </clock>
       <keyboard>

From 101cfe4b1c175ab73bef87838bdb64494552e304 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 12 Nov 2019 14:15:33 -0500
Subject: [PATCH 3/4] Implement sle15.N for SuSE 15 service packs

---
 xCAT-server/lib/xcat/plugins/sles.pm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 7054fb6b3..0eb2e9a4d 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -1753,10 +1753,22 @@ sub copycd
         }
         if ($dsc =~ /Installer/ and $dsc =~ /SLE-15/) {
             $discnumber = 1;
-            unless ($distname) { $distname = "sle15" };
+            unless ($distname) {
+                if ($dsc =~ /SLE-15-SP(\d)/) {
+                    $distname = "sle15.$1";
+                } else {
+                    $distname = "sle15";
+                }
+            };
         } elsif ($dsc =~ /SLE-15/ and $dsc =~ /Packages/) {
             $discnumber = 2;
-            unless ($distname) { $distname = "sle15" };
+            unless ($distname) {
+                if ($dsc =~ /SLE-15-SP(\d)/) {
+                    $distname = "sle15.$1";
+                } else {
+                    $distname = "sle15";
+                }
+            };
         }
     }
 

From b1dc4d8dcae8cf20360f03aa44ec1fe967bdd905 Mon Sep 17 00:00:00 2001
From: Markus Hilger <Markus.Hilger@de.ibm.com>
Date: Fri, 17 Jan 2020 20:49:37 +0100
Subject: [PATCH 4/4] SLE15: compute template change to UTC

---
 xCAT-server/share/xcat/install/sles/compute.sle15.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl b/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
index b5254111d..4d9a5884e 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
@@ -12,7 +12,7 @@
     </bootloader>
     <general>
       <clock>
-        <hwclock>GMT</hwclock>
+        <hwclock>UTC</hwclock>
         <timezone>#TABLE:site:key=timezone:value#</timezone>
       </clock>
       <keyboard>