From 80dc1ce1a71f64683ac8e6a68a75f001d3f6830b Mon Sep 17 00:00:00 2001 From: ligc Date: Mon, 19 May 2014 10:59:16 -0500 Subject: [PATCH] fix for bug 4130: mkdef/chdef handle the nics* attributes for node group --- xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm index b9c2f3364..58c9ae5a7 100755 --- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm +++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm @@ -2586,7 +2586,7 @@ sub setFINALattrs # special case for the nic* attributes # merge nic*.eth0, nic*.eth1 - if ($::FILEATTRS{$objname}{objtype} eq 'node') + if (($::FILEATTRS{$objname}{objtype} eq 'node') || ($::FILEATTRS{$objname}{objtype} eq 'group')) { xCAT::DBobjUtils->collapsenicsattr($::FILEATTRS{$objname}, $objname); } @@ -2647,7 +2647,7 @@ sub setFINALattrs unless(exists($::CLIATTRS{$objname})) { next; } - if ($::CLIATTRS{$objname}{objtype} eq 'node') + if (($::CLIATTRS{$objname}{objtype} eq 'node') || ($::CLIATTRS{$objname}{objtype} eq 'group')) { # Even if only the nicips.eth0 is specified with CLI, # need to read the whole nicips attribute from the nics table,