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

Merge pull request #5737 from bybai/ubu

Browse Source 
nodeset ubuntu16.04.5 x86_64 support
This commit is contained in:
zet809 2018-10-26 15:03:04 +08:00 committed by GitHub
commit 949edfad57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -770,7 +770,7 @@ sub mkinstall {
if ($arch =~ /ppc64/i and !(-e "$pkgdir/install/netboot/initrd.gz") and
!(-e "$pkgdir/install/netboot/ubuntu-installer/$darch/initrd.gz")) {
xCAT::MsgUtils->report_node_error($callback, $node,
xCAT::MsgUtils->report_node_error($callback, $node,
"The network boot initrd.gz is not found in $pkgdir/install/netboot. This is provided by Ubuntu, please download and retry."
);
next;
@ -788,7 +788,7 @@ sub mkinstall {
($arch =~ /x86/ and
(
(-r "$pkgdir/install/hwe-netboot/ubuntu-installer/$darch/linux"
and $kernpath = "$pkgdir/hwe-install/netboot/ubuntu-installer/$darch/linux"
and $kernpath = "$pkgdir/install/hwe-netboot/ubuntu-installer/$darch/linux"
and -r "$pkgdir/install/hwe-netboot/ubuntu-installer/$darch/initrd.gz"
and $initrdpath = "$pkgdir/install/hwe-netboot/ubuntu-installer/$darch/initrd.gz"
) or