From 3cabd58e9aadaca2095e1257baeb6812d4c788db Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 12 Nov 2019 14:15:33 -0500 Subject: [PATCH] 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"; + } + }; } }