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

For x86, select a faster mechanism for injecting driver disks so that nodeset is significantly faster

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11689 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-02-25 17:48:11 +00:00
parent 75988c0344
commit 7712d54227
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -1208,11 +1208,8 @@ sub insert_dd {
my $pkgdir="$install_dir/$os/$arch";
# Unzip the original initrd
if ($arch =~ /x86/) {
$cmd = "gunzip --quiet -c $img > $dd_dir/initrd";
} elsif ($arch =~/ppc/) {
if ($arch =~/ppc/) {
$cmd = "gunzip --quiet -c $pkgdir/1/suseboot/initrd64 > $dd_dir/initrd";
}
xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0) {
my $rsp;
@ -1230,10 +1227,10 @@ sub insert_dd {
xCAT::MsgUtils->message("E", $rsp, $callback);
return ();
}
}
# Create the dir for driver update disk
$cmd = "mkdir -p $dd_dir/initrd_img/cus_driverdisk";
xCAT::Utils->runcmd($cmd, -1);
mkpath("$dd_dir/initrd_img/cus_driverdisk");
# insert the driver update disk into the cus_driverdisk dir
foreach my $dd (@dd_list) {
@ -1258,7 +1255,15 @@ sub insert_dd {
xCAT::Utils->runcmd($cmd, -1);
if ($arch =~ /x86/) {
copy ("$dd_dir/initrd.gz", "$img");
my $rdhandle;
my $ddhandle;
open($rdhandle,">>",$img);
open ($ddhandle,"<","$dd_dir/initrd.gz");
binmode($rdhandle);
binmode($ddhandle);
{ local $/ = 32768; my $block; while ($block = <$ddhandle>) { print $rdhandle $block; } }
close($rdhandle);
close($ddhandle);
} elsif ($arch =~/ppc/) {
# make sure the src kernel existed
$cmd = "gunzip -c $pkgdir/1/suseboot/linux64.gz > $dd_dir/kernel";
@ -1274,6 +1279,7 @@ sub insert_dd {
return ();
}
}
system("rm -rf $dd_dir");
my $rsp;
push @{$rsp->{data}}, "Inserted the driver update disk:".join(',', sort(@dd_list)).".";