arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make bootorder fixup on rpower work in kvm again

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7349 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-09-02 18:46:35 +00:00
parent 9eab2b08d5
commit cce0debccf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@ -289,25 +289,27 @@ sub fixbootorder {
my $xml = shift;
my $domdesc = $parser->parse_string($xml);
my @bootdevs = $domdesc->findnodes("/domain/os/boot");
my @oldbootdevs;
my $needfixin=0;
if (defined $confdata->{vm}->{$node}->[0]->{bootorder}) {
my @expectedorder = split(/[:,]/,$confdata->{vm}->{$node}->[0]->{bootorder});
foreach (@expectedorder) { #this loop will check for changes and fix 'n' and 'net'
my $currdev = shift @bootdevs;
unless ($currdev) { $needfixin=1; }
if ("net" eq $_ or "n" eq $_) {
$_ = "network";
}
unless ($currdev->getAttribute("dev") eq $_) {
unless ($currdev and $currdev->getAttribute("dev") eq $_) {
$needfixin=1;
}
push @oldbootdevs,$currdev;
}
if (scalar(@bootdevs)) {
$needfixin=1;
push @oldbootdevs,@bootdevs;
}
unless ($needfixin) { return 0; }
#ok, we need to remove all 'boot' nodes from current xml, and put in new ones in the order we like
foreach (@bootdevs) {
foreach (@oldbootdevs) {
$_->parentNode->removeChild($_);
}
#now to add what we want...