From a60bb9d50c2e2c785854010faa03418bfb9dff22 Mon Sep 17 00:00:00 2001 From: immarvin Date: Thu, 5 Dec 2013 21:51:47 -0800 Subject: [PATCH] rhels6.5 support --- perl-xCAT/xCAT/data/discinfo.pm | 2 ++ xCAT-server/sbin/xcatconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm index a14111d4f..5221c765d 100755 --- a/perl-xCAT/xCAT/data/discinfo.pm +++ b/perl-xCAT/xCAT/data/discinfo.pm @@ -60,6 +60,8 @@ require Exporter; "1339638991.532890" => "rhels6.3", #i386 "1359576752.435900" => "rhels6.4", #x86_64 "1359576196.686790" => "rhels6.4", #ppc64 + "1384196515.415715" => "rhels6.5", #x86_64 + "1384198011.520581" => "rhels6.5", #ppc64 "1285193176.593806" => "rhelhpc6", #x86_64 "1305067719.718814" => "rhelhpc6.1",#x86_64 "1321545261.599847" => "rhelhpc6.2",#x86_64 diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig index 117e19caa..327fac71d 100755 --- a/xCAT-server/sbin/xcatconfig +++ b/xCAT-server/sbin/xcatconfig @@ -1057,7 +1057,7 @@ sub is_redhat6sp4 open(my $relfile, "<", "/etc/redhat-release"); my $line = <$relfile>; close($relfile); - if ( $line =~ /Red Hat Enterprise Linux Server release 6.4/i ){ + if ( $line =~ /Red Hat Enterprise Linux Server release 6.[4-5]/i ){ return 1; } }