xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-06 18:28:16 +00:00
Code Issues Releases Wiki Activity

Add dd=file:///dd.img for single dd injection

Browse Source 
In single dd injection, was missing the dd argument
correct this.
This commit is contained in:
Jarrod Johnson
2017-05-18 15:46:53 -04:00
parent 86363a518e
commit 3213ceb972
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1412,6 +1412,7 @@ sub mkinstall
$donetftp{"$os|$arch|$profile|$tftpdir"} = 1;
}
}
my $ddad;
if ($docopy) {
mkpath("$tftppath");
@@ -1421,7 +1422,7 @@ sub mkinstall
unless ($noupdateinitrd) {
copy($kernpath, "$tftppath");
copy($initrdpath, "$tftppath/initrd.img");
&insert_dd($callback, $os, $arch, "$tftppath/initrd.img", "$tftppath/vmlinuz", $driverupdatesrc, $netdrivers, $osupdir, $ignorekernelchk);
$ddad = insert_dd($callback, $os, $arch, "$tftppath/initrd.img", "$tftppath/vmlinuz", $driverupdatesrc, $netdrivers, $osupdir, $ignorekernelchk);
}
}
xCAT::MsgUtils->trace($verbose_on_off, "d", "anaconda->mkinstall: copy initrd.img and vmlinuz to $tftppath");
@@ -1473,6 +1474,9 @@ sub mkinstall
if ($maxmem) {
$kcmdline .= " mem=$maxmem";
}
if ($ddad) {
$kcmdline .= $ddad;
}
# Add kernel parameters to specify the boot network interface
@@ -3390,12 +3394,14 @@ EOMS
copy("$dd_dir/initrd.img", $img);
}
my $kerneladd = "";
# dracut + driver disk, just append the driver disk to the initrd
if (<$install_dir/$os/$arch/Packages/dracut*> && @dd_list) { #new style, skip the fanagling, copy over the dds and append them...
mkpath("$dd_dir/dd");
if (scalar(@dd_list) == 1) { #only one, just append it..
copy($dd_list[0], "$dd_dir/dd/dd.img");
$kerneladd = " dd=file:///dd.img ";
} elsif (scalar(@dd_list) > 1) {
unless (-x "/usr/bin/createrepo" and -x "/usr/bin/mkisofs") {
my $rsp;
@@ -3467,7 +3473,7 @@ EOMS
xCAT::MsgUtils->message("I", $rsp, $callback);
return @inserted_dd;
return $kerneladd; # @inserted_dd;
}
1;