xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-11-04 05:12:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1536 from immarvin/ongeninitrd

Browse Source 
fix issue  geninitrd fails when pkgdir has more than one directory #1538 ; fix  geninitrd fails to identify a ppc64le kernel #1539
This commit is contained in:
Xiaopeng Wang
2016-07-18 14:41:35 +08:00
committed by GitHub
parent 79f45fa8f7 9344ec5558
commit 541f4e6c79
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -2564,7 +2564,7 @@ sub insert_dd {
my @osupdirs = split (/,/, $osupdirlist);
foreach my $osupdir (@osupdirs) {
# find all the rpms start with kernel.*
my @kernel_rpms = `find $osupdir -name kernel-*.rpm`;
my @kernel_rpms = `find $osupdir -name 'kernel-*.rpm'`;
push @rpm_list, @kernel_rpms;
}
}
@@ -2706,7 +2706,7 @@ sub insert_dd {
# and copy it to the /tftpboot
my @new_kernels = <$dd_dir/rpm/boot/vmlinuz*>;
foreach my $new_kernel (@new_kernels) {
if (-r $new_kernel && $new_kernel =~ /\/vmlinuz-(.*(x86_64|ppc64|el\d+))$/) {
if (-r $new_kernel && $new_kernel =~ /\/vmlinuz-(.*(x86_64|ppc64|el\d+|ppc64le))$/) {
$new_kernel_ver = $1;
$cmd = "/bin/mv -f $new_kernel $kernelpath";
xCAT::Utils->runcmd($cmd, -1);

2
xCAT-server/lib/xcat/plugins/geninitrd.pm
View File

@@ -123,6 +123,8 @@ sub geninitrd {
return;
}
$pkgdir = $lient->{'pkgdir'};
my @srcdir=split(/,/,$pkgdir);
$pkgdir = $srcdir[0];
$driverupdatesrc = $lient->{'driverupdatesrc'};
$netdrivers = $lient->{'netdrivers'};