From c7d4bc3452b0152fa7d7f520a9c79480ec6ea096 Mon Sep 17 00:00:00 2001
From: jet777 <jet777@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 1 Jun 2010 14:53:58 +0000
Subject: [PATCH] feature 3006951
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6288 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-server/lib/xcat/plugins/toolscenter.pm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/xCAT-server/lib/xcat/plugins/toolscenter.pm b/xCAT-server/lib/xcat/plugins/toolscenter.pm
index 8cf6e4eb9..d0785ab68 100644
--- a/xCAT-server/lib/xcat/plugins/toolscenter.pm
+++ b/xCAT-server/lib/xcat/plugins/toolscenter.pm
@@ -156,8 +156,8 @@ sub mknetboot
my $restab = xCAT::Table->new('noderes');
my $bptab = xCAT::Table->new('bootparams',-create=>1);
my $hmtab = xCAT::Table->new('nodehm');
- my $cmostab = xCAT::Table->new('cmossettings');
- my $cmoshash = $cmostab->getNodesAttribs(\@nodes, ['file']);
+ my $firmtab = xCAT::Table->new('firmware');
+ my $firmhash = $firmtab->getNodesAttribs(\@nodes, ['cfgfile']);
my $reshash = $restab->getNodesAttribs(\@nodes, ['tftpserver','xcatmaster']);
my $hmhash =
$hmtab->getNodesAttribs(\@nodes,
@@ -185,9 +185,9 @@ sub mknetboot
my $suffix = 'gz';
my $path = "/$installroot/netboot/$osver/$arch/$profile";
my $tpath = "/$tftpdir/xcat/netboot/$osver/$arch/$profile";
- my $cmosfile = $cmoshash->{$node}->[0]->{file};
- if ($cmosfile) {
- copy($cmosfile,"$path/repo/$node.cmos");
+ my $firmfile = $firmhash->{$node}->[0]->{cfgfile};
+ if ($firmfile) {
+ copy($firmfile,"$path/repo/$node.cfgfile");
}
my $asu = "/toolscenter/asu";
if ($ent->{arch} eq "x86_64") {
@@ -353,8 +353,8 @@ ENDOFAWK
}
$tpath =~ s!/$tftpdir/!!;
my $kcmdline = "vga=0x317 root=/dev/ram0 rw ramdisk_size=100000 tftp_server=$imgsrv tftp_tcrootfs=$tpath/tcrootfs tftp_tczip=$tpath/tc.zip xcat_server=$xcatserver hostname=$node";
- if ($cmosfile) {
- $kcmdline .= " cmos_file=/bomc/$node.cmos";
+ if ($firmfile) {
+ $kcmdline .= " cmos_file=/bomc/$node.cfgfile";
}
if (defined $sent->{serialport})
{