From 761a8f8373ef660163351603b7f9af0d06ae8d6d Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Thu, 20 Oct 2016 13:31:13 -0400 Subject: [PATCH] upport kitcomponent can be add to higher version of OS --- xCAT-server/lib/xcat/plugins/kit.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm index 6e135ba8c..ba1db981f 100644 --- a/xCAT-server/lib/xcat/plugins/kit.pm +++ b/xCAT-server/lib/xcat/plugins/kit.pm @@ -1844,7 +1844,7 @@ sub validate_os { return 1; } - if ($kitcomp->{osminorversion} and ($osimage->{minorversion} ne $kitcomp->{osminorversion})) { + if ($kitcomp->{osminorversion} and ($osimage->{minorversion} lt $kitcomp->{osminorversion})) { # my %rsp; # push@{ $rsp{data} }, "osimage $os is not compatible with kit component $kitcomp->{kitcompname} with attribute minorversion"; @@ -2149,7 +2149,7 @@ sub addkitcomp return 1; } - if ($kitcomps{$kitcomp}{osminorversion} and ($os{$osimage}{minorversion} ne $kitcomps{$kitcomp}{osminorversion})) { + if ($kitcomps{$kitcomp}{osminorversion} and ($os{$osimage}{minorversion} lt $kitcomps{$kitcomp}{osminorversion})) { my %rsp; push @{ $rsp{data} }, "osimage $osimage is not compatible with kit component $kitcomp with attribute minorversion"; xCAT::MsgUtils->message("E", \%rsp, $callback); @@ -3606,7 +3606,7 @@ sub chkkitcomp return 1; } - if ($kitcomps{$kitcomp}{osminorversion} and ($os{$osimage}{minorversion} ne $kitcomps{$kitcomp}{osminorversion})) { + if ($kitcomps{$kitcomp}{osminorversion} and ($os{$osimage}{minorversion} lt $kitcomps{$kitcomp}{osminorversion})) { my %rsp; push @{ $rsp{data} }, "kit component $kitcomp is not compatible with osimage $osimage with attribute minorversion"; xCAT::MsgUtils->message("E", \%rsp, $callback); @@ -5080,7 +5080,7 @@ sub get_compat_kitreponames { if (defined($kitrepo->{osmajorversion}) && $kitrepo->{osmajorversion} ne $osdistro->{majorversion}) { next; } - if (defined($kitrepo->{osminorversion}) && $kitrepo->{osminorversion} ne $osdistro->{minorversion}) { + if (defined($kitrepo->{osminorversion}) && $osdistro->{minorversion} lt $kitrepo->{osminorversion} ) { next; } if (defined($kitrepo->{osarch}) && $kitrepo->{osarch} ne $osdistro->{arch} && $kitrepo->{osarch} ne 'noarch') {