Commit ccb66ff7 authored by Jarrod Johnson's avatar Jarrod Johnson
Browse files

Merge branch '2.8' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.8

parents cfb4a4cb 92692d69
......@@ -84,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%{prefix}
/install/postscripts
/install/chef-cookbooks
%defattr(-,root,root)
......
......@@ -18,7 +18,7 @@ B<rflash> I<noderange> B<-p> I<directory> B<--activate> B<disruptive>|B<deferred
B<rflash> I<noderange> {B<--commit>|B<--recover>}
=head2 BMC (with FPC) specific:
=head2 NeXtScale FPC specific:
B<rflash> I<noderange> I<http directory>
......@@ -73,7 +73,7 @@ For Power 775, the rflash command takes effect on the primary and secondary FSPs
For more details about the Firmware Update using Direct FSP/BPA Management, refer to:
https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Power_775_Hardware_Management#Updating_the_BPA_and_FSP_firmware_using_xCAT_DFM
=head2 BMC (with NeXtScale FPC) specific:
=head2 NeXtScale FPC specific:
The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http imformation required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http. Refer to the link to get more details:
https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_NeXtScale_Clusters#Update_the_FPC_firmware_.28optional.29
......
......@@ -576,20 +576,13 @@ sub process_request {
if (xCAT::Utils->isAIX())
{
#try to stop named
my $cmd = "/usr/bin/stopsrc -s $service";
my @output=xCAT::Utils->runcmd($cmd, 0);
my $outp = join('', @output);
if ($::RUNCMD_RC != 0)
{
my $rsp = {};
$rsp->{data}->[0] = "Command failed: $cmd. Error message: $outp.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
return;
}
$cmd = "/usr/bin/startsrc -s $service";
@output=xCAT::Utils->runcmd($cmd, 0);
$outp = join('', @output);
my $outp = join('', @output);
if ($::RUNCMD_RC != 0)
{
my $rsp = {};
......
......@@ -199,7 +199,7 @@ function add_ip_temporary(){
str_label=$str_nic_name
fi
str_bcase=$(calcbcase $str_ip $str_mask)
str_bcase=$(v4calcbcase $str_ip $str_mask)
#the label is ready, add the ip address directly
ip addr add $str_ip/${str_mask} broadcast $str_bcase dev $str_nic_name scope global label $str_label
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment