From 9810da03b60e676233cefef43e5a22e8e1d86c51 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH] Remove trailing spaces in file xCAT-server/lib/xcat/plugins/nodediscover.pm --- xCAT-server/lib/xcat/plugins/nodediscover.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm index 9c6e86314..1ba0b1a16 100644 --- a/xCAT-server/lib/xcat/plugins/nodediscover.pm +++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm @@ -236,9 +236,9 @@ sub process_request { $nrtab->setNodeAttribs($node, { netboot => 'petitboot' }); } elsif ($request->{arch}->[0] =~ /ppc/ and $currboot !~ /yaboot/) { $nrtab->setNodeAttribs($node, { netboot => 'yaboot' }); - } elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) { + } elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) { #for onie switch, the netboot should be "onie" - $nrtab->setNodeAttribs($node, { netboot => 'onie' }); + $nrtab->setNodeAttribs($node, { netboot => 'onie' }); } } @@ -254,14 +254,14 @@ sub process_request { $switchtype=$xCAT::data::switchinfo::global_switch_type{$1}; } } - + if($switchtype){ $switchestab->setNodeAttribs($node,{ switchtype => $switchtype }); } $switchestab->close(); } } - + my $macstring = ""; if (defined($request->{mac})) { @@ -319,7 +319,7 @@ sub process_request { my $hosttag = gethosttag($node, $netn, @ifinfo[1], \%usednames); unless ($hosttag) { my $nettagname = $usednames_for_net{$netn}; - # For nics not in the install network, don't deal with them if not an available hostname get + # For nics not in the install network, don't deal with them if not an available hostname get # In case another nic in install network get a hosttag other than nodename, need to compare the IP address they can convert to if ($nettagname and (inet_aton($nettagname) eq inet_aton($node))) { $hosttag = "$node-$ifinfo[1]"; @@ -461,7 +461,7 @@ sub process_request { if (defined($request->{bmc_node}) and defined($request->{bmc_node}->[0])) { $bmc_node = $request->{bmc_node}->[0]; } - + if (-x "/usr/bin/goconserver") { xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: remove gocons session for $bmc_node"); require xCAT::Goconserver; @@ -496,7 +496,7 @@ sub process_request { } } } - + my $restartstring = "restart"; if (scalar @forcenics > 0) {