From 2c22c82b4d34af9d62e2c86959a038ed6376d4e7 Mon Sep 17 00:00:00 2001 From: Patrick Lundgren Date: Thu, 12 Nov 2015 16:53:52 -0500 Subject: [PATCH] SLES12SP1 Support added to sles.pm RHELS7.2 IDs added to discinfo.pm --- perl-xCAT/xCAT/data/discinfo.pm | 3 +++ xCAT-server/lib/xcat/plugins/sles.pm | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm index d7ecf0bb9..7918cd2f4 100755 --- a/perl-xCAT/xCAT/data/discinfo.pm +++ b/perl-xCAT/xCAT/data/discinfo.pm @@ -80,6 +80,9 @@ require Exporter; "1424360759.989976" => "rhels7.1", #x86_64 "1424360759.878519" => "rhels7.1", #ppc64 "1424361409.280138" => "rhels7.1", #ppc64le + "1446216863.790260" => "rhels7.2", #x86_64 + "1446216863.764721" => "rhels7.2", #ppc64 + "1446216863.771788" => "rhels7.2", #ppc64le "1285193176.593806" => "rhelhpc6", #x86_64 "1305067719.718814" => "rhelhpc6.1",#x86_64 "1321545261.599847" => "rhelhpc6.2",#x86_64 diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index a44eb0a53..996cd3487 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -1770,8 +1770,13 @@ sub copycd # only set to $1 if the regex was successful if ($_ =~ /sles:(\d+),/) { $distname = "sles".$1; + } elsif ($_ =~ /sles:(\d+):sp(\d+),/) { + $distname = "sles".$1.".".$2; } elsif ($_ =~ /Software Development Kit\s*(\d+)/) { $distname = "sles".$1; + if ($_ =~ /sdk:(\d+):sp(\d+),/) { + $distname = "sles".$1.".".$2; + } } } }