xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 10:06:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1061 from immarvin/onslesmkinstall

Browse Source 
from sles11.3, suseboot/linux64 and suseboot/initrd64 should be used in diskful installation instead of suseboot/inst64
This commit is contained in:
Xiaopeng Wang 2016-05-09 18:23:36 +08:00
commit 0a88a9242b
1 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1070,6 +1070,11 @@ sub mkinstall
and -r "$pkgdir/1/boot/ppc64le/linux"
and -r "$pkgdir/1/boot/ppc64le/initrd"
)
or (
$arch eq "ppc64"
and -r "$pkgdir/1/suseboot/linux64"
and -r "$pkgdir/1/suseboot/initrd64"
)
or ($arch =~ /ppc/ and -r "$pkgdir/1/suseboot/inst64")
)
{
@ -1120,12 +1125,25 @@ sub mkinstall
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: copy initrd.img and linux to $tftppath");
}
}
elsif ($arch =~ /ppc/)
{
elsif($arch eq "ppc64"){
unless ($noupdateinitrd) {
copy("$pkgdir/1/suseboot/inst64", "$tftppath");
@dd_drivers = &insert_dd($callback, $os, $arch, "$tftppath/inst64", undef, $driverupdatesrc, $netdrivers, $osupdir, $ignorekernelchk);
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: copy inst64 to $tftppath");
if(-r "$pkgdir/1/suseboot/linux64" and -r "$pkgdir/1/suseboot/initrd64"){
#from sles11.3, suseboot/linux64 and suseboot/initrd64 are used for diskful
#network installation
#the previous suseboot/inst64 can not be run on Power8 BE
copy("$pkgdir/1/suseboot/linux64", "$tftppath");
copy("$pkgdir/1/suseboot/initrd64", "$tftppath");
#TODO: need to verify whether initrd64 and linux64 can be inserted into initrd
#@dd_drivers = &insert_dd($callback, $os, $arch,"$tftppath/initrd64" ,"$tftppath/linux64", undef, $driverupdatesrc, $netdrivers, $osupdir, $ignorekernelchk);
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: copy initrd64 and linux64 to $tftppath");
}
elsif(-r "$pkgdir/1/suseboot/inst64"){
#suseboot/inst64 is used for network installation before sles11.3
#suseboot/inst64 can not be run on Power8 BE
copy("$pkgdir/1/suseboot/inst64", "$tftppath");
@dd_drivers = &insert_dd($callback, $os, $arch, "$tftppath/inst64", undef, $driverupdatesrc, $netdrivers, $osupdir, $ignorekernelchk);
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: copy inst64 to $tftppath");
}
}
}
}
@ -1318,21 +1336,40 @@ sub mkinstall
kcmdline => $kcmdline
}
);
}
elsif ($arch =~ /ppc/)
}
elsif ($arch eq "ppc64")
{
$kernelpath = "$rtftppath/inst64";
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: kcmdline=$kcmdline kernal=$kernelpath initrd=");
$bptab->setNodeAttribs(
$node,
{
kernel => $kernelpath,
initrd => "",
kcmdline => $kcmdline
}
);
if(-r "$tftppath/linux64" and -r "$tftppath/initrd64"){
#from sles11.3, suseboot/linux64 and suseboot/initrd64 are used for diskful
#network installation
#the previous suseboot/inst64 can not be run on Power8 BE
$kernelpath = "$rtftppath/linux64";
$initrdpath = "$rtftppath/initrd64";
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: kcmdline=$kcmdline kernal=$kernelpath initrd=$initrdpath");
$bptab->setNodeAttribs(
$node,
{
kernel => $kernelpath,
initrd => $initrdpath,
kcmdline => $kcmdline
}
);
}
elsif(-r "$tftppath/inst64"){
#suseboot/inst64 is used for network installation before sles11.3
#suseboot/inst64 can not be run on Power8 BE
$kernelpath = "$rtftppath/inst64";
xCAT::MsgUtils->trace($verbose_on_off,"d","sles->mkinstall: kcmdline=$kcmdline kernal=$kernelpath initrd=");
$bptab->setNodeAttribs(
$node,
{
kernel => $kernelpath,
initrd => "",
kcmdline => $kcmdline
}
);
}
}
}
else
{