From 9abe96809bf53299e5f1a8cc2b2f805dd649ae00 Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Fri, 27 Oct 2017 17:10:47 +0800 Subject: [PATCH] Fix 3026, ignore the rsetboot for openbmc box in petitboot during the stateful installation (#4193) --- xCAT-server/lib/xcat/plugins/openbmc.pm | 3 +++ xCAT-server/lib/xcat/plugins/petitboot.pm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index 407f122fe..4a6f3909c 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -397,6 +397,9 @@ my $flag_debug = "[openbmc_debug]"; #------------------------------------------------------- sub preprocess_request { my $request = shift; + if (defined $request->{_xcat_ignore_flag}->[0] and $request->{_xcat_ignore_flag}->[0] eq 'openbmc') { + return [];#workaround the bug 3026, to ignore it for openbmc + } if (defined $request->{_xcatpreprocessed}->[0] and $request->{_xcatpreprocessed}->[0] == 1) { return [$request]; } diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm index 28287b14a..e6707b7e5 100644 --- a/xCAT-server/lib/xcat/plugins/petitboot.pm +++ b/xCAT-server/lib/xcat/plugins/petitboot.pm @@ -561,6 +561,8 @@ sub process_request { $sub_req->({ command => ['rsetboot'], node => \@nodes, arg => ['default'], + #workaround the bug 3026, to ignore it for openbmc + _xcat_ignore_flag => ['openbmc'], #todo: do not need to pass the XCAT_OPENBMC_DEVEL after the openbmc dev work finish #this does not hurt anything for other plugins environment => {XCAT_OPENBMC_DEVEL=>"YES"}