xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-28 04:58:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3996 from xcat2/master

Browse Source 
Merge master to 2.13 for 2.13.7 release (4)
This commit is contained in:
zet809
2017-09-22 14:09:05 +08:00
committed by GitHub
parent 954ac1543a 9b3664569b
commit 9ec6d0c0cc
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-genesis-scripts/bin/dodiscovery
View File

@@ -159,10 +159,12 @@ fi
flag_mtm=`echo '$MTM' | sed 's/0//g'`
if [ $flag_mtm ] && [ "$MTM" != "unknown" ]; then
MTM=`echo $MTM | sed 's/\.//g'`
echo "<mtm>$MTM</mtm>" >> /tmp/discopacket
fi
flag_serial=`echo '$SERIAL' | sed 's/0//g'`
if [ $flag_serial ] && [ "$SERIAL" != "unknown" ]; then
SERIAL=`echo $SERIAL | sed 's/\.//g'`
echo "<serial>$SERIAL</serial>" >> /tmp/discopacket
fi
if [ "$PLATFORM" != "unknown" ]; then

4
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@@ -1155,8 +1155,8 @@ sub bmcdiscovery_openbmc{
}
# delete space before and after
$mtm =~ s/^\s+|\s+$//g;
$serial =~ s/^\s+|\s+$//g;
$mtm =~ s/^\s+|\s+$|\.+//g;
$serial =~ s/^\s+|\s+$|\.+//g;
$mtm = '' if ($mtm =~ /^0+$/);
$serial = '' if ($serial =~ /^0+$/);

2
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@@ -1781,7 +1781,7 @@ sub rspconfig_response {
if ($node_info{$node}{cur_status} eq "RSPCONFIG_SET_RESPONSE") {
if ($response_info->{'message'} eq $::RESPONSE_OK) {
xCAT::SvrUtils::sendmsg("BMC Setting Hostname (requires bmcreboot to take effect)...", $callback, $node);
xCAT::SvrUtils::sendmsg("BMC Setting Hostname...", $callback, $node);
}
}
if ($node_info{$node}{cur_status} eq "RSPCONFIG_DHCP_RESPONSE") {