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"; + } + }; } } 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 @@ - GMT + UTC #TABLE:site:key=timezone:value# 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 @@ - GMT + UTC #TABLE:site:key=timezone:value# 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 @@ - GMT + UTC #TABLE:site:key=timezone:value# 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 @@ - GMT + UTC #TABLE:site:key=timezone:value#