From 0efb6aa83f56a42f1b75a3a2aa6f3e239f1f1263 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Wed, 29 Mar 2017 13:00:24 +0800
Subject: [PATCH] fix issue rinstall is not able to set or detect the arch ,
 does not happen with nodeset #2745

---
 xCAT-server/lib/xcat/plugins/rinstall.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/rinstall.pm b/xCAT-server/lib/xcat/plugins/rinstall.pm
index 666935592..b68bf8ac3 100644
--- a/xCAT-server/lib/xcat/plugins/rinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/rinstall.pm
@@ -218,9 +218,9 @@ sub rinstall {
             }
             my $nodetypearch = $nodetypeattribs->{'arch'};
             if ($nodetypearch ne $osimagearch) {
-                unless ((($nodetypearch =~ /ppc64le/) or ($nodetypearch =~ /ppc64el/)) and (($osimagearch =~ /ppc64le/) or ($osimagearch =~ /ppc64el/))) {
+	        unless(($nodetypearch =~ /^ppc64(le|el)?$/i) and ($osimagearch =~ /^ppc64(le|el)?$/i)){
                     my $rsp = {};
-                    $rsp->{error}->[0] = "$node: The value of 'arch' attribute is not same as the 'osarch' attribute for osimage.";
+                    $rsp->{error}->[0] = "$node: The value of 'arch' attribute of node does not match the 'osarch' attribute of osimage.";
                     $rsp->{errorcode}->[0] = 1;
                     xCAT::MsgUtils->message("E", $rsp, $callback);
                     next;