From 96d759dc2ff1d5393ab18b2d2187a312509e3174 Mon Sep 17 00:00:00 2001 From: qyin Date: Wed, 21 May 2014 14:52:10 +0800 Subject: [PATCH] fix the nodeset - noupdate initrd issue --- xCAT-server/lib/xcat/plugins/destiny.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm index bcc75b2cc..851df0680 100644 --- a/xCAT-server/lib/xcat/plugins/destiny.pm +++ b/xCAT-server/lib/xcat/plugins/destiny.pm @@ -552,6 +552,7 @@ sub nextdestiny { } my $node; + my $noupdate_flag = 0; $chaintab = xCAT::Table->new('chain'); my $chainents = $chaintab->getNodesAttribs(\@nodes,[qw(currstate currchain chain)]); foreach $node (@nodes) { @@ -583,14 +584,24 @@ sub nextdestiny { { my @items = split /[:]/,$ref->{currstate}; $requ{arg}= \@items; + $noupdate_flag = 1; } setdestiny(\%requ, $flag+1); } if ($callnodeset) { + my $args; + if ($noupdate_flag) + { + $args = ['enact', '--noupdateinitrd']; + } + else + { + $args = ['enact']; + } $subreq->({command=>['nodeset'], node=> \@nodes, - arg=>['enact', '--noupdateinitrd']}); + arg=>$args}); } }