From eaf7325a1cc597d7d89c6ec12dd1555d647c2d1f Mon Sep 17 00:00:00 2001 From: immarvin Date: Fri, 29 Aug 2014 00:30:28 -0700 Subject: [PATCH] fix defect #4242 In physical rhel7 env,set installnic=ethx can not provision compute node. --- xCAT-server/lib/perl/xCAT/Postage.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index 2fb9c9245..3d7ba772b 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -1864,6 +1864,7 @@ sub getPostScripts $result .= "setbootfromdisk\n"; } + #for redhat 7, append "disableconsistentNICrename" to default postscripts #if "net.ifnames=0" is specified in kcmdline/addkcmdline of node or osimage @@ -1874,7 +1875,7 @@ sub getPostScripts my $nrret = $::GLOBAL_TAB_HASH{noderes}{$node}; my $netboot = $nrret->{'netboot'}; - if( ($os =~ "rhel7*") || ($os =~ "rhels7*") ) + if( (($os =~ "rhel7*") || ($os =~ "rhels7*")) && ($nodesetstate) && ($nodesetstate eq "install") ) { my $nodecfg; if($netboot eq "grub2")