xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00
Code Issues Releases Wiki Activity

fix5209 nodeset cannot find pxelinux.0 (#5783)

Browse Source 
* distro pxelinux.0 default path is changed in ubuntu 16.04
This commit is contained in:
Yuan Bai 2018-11-09 17:03:58 +08:00 committed by Bin Xu
parent 5f2a90972c
commit 5db2dbd62c
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,6 +253,10 @@ sub process_request {
copy("/usr/lib/syslinux/pxelinux.0", "$tftpdir/pxelinux.0");
} elsif (-r "/usr/share/syslinux/pxelinux.0") {
copy("/usr/share/syslinux/pxelinux.0", "$tftpdir/pxelinux.0");
} elsif ("/usr/lib/PXELINUX/pxelinux.0") {
copy("/usr/lib/PXELINUX/pxelinux.0", "$tftpdir/pxelinux.0");
} else {
copy("/opt/xcat/share/xcat/netboot/syslinux/pxelinux.0", "$tftpdir/pxelinux.0");
}
if (-r "$tftpdir/pxelinux.0") {
chmod(0644, "$tftpdir/pxelinux.0");

21
xCAT-server/lib/xcat/plugins/pxe.pm
View File

@ -478,24 +478,19 @@ sub process_request {
}
#end prescripts code
if (!-r "$tftpdir/pxelinux.0") {
unless (-r "/usr/lib/syslinux/pxelinux.0" or -r "/usr/share/syslinux/pxelinux.0") {
$::PXE_callback->({ error => ["Unable to find pxelinux.0 "], errorcode => [1] });
return;
my @pxelinuxpaths=("/usr/lib/syslinux/pxelinux.0","/usr/share/syslinux/pxelinux.0","/usr/lib/PXELINUX/pxelinux.0","/opt/xcat/share/xcat/netboot/syslinux/pxelinux.0");
foreach $path (@pxelinuxpaths) {
if (-r "$path") {
copy("$path","$globaltftpdir/pxelinux.0");
chmod(0644, "$globaltftpdir/pxelinux.0");
last;
}
if (-r "/usr/lib/syslinux/pxelinux.0") {
copy("/usr/lib/syslinux/pxelinux.0", "$tftpdir/pxelinux.0");
} else {
copy("/usr/share/syslinux/pxelinux.0", "$tftpdir/pxelinux.0");
}
chmod(0644, "$tftpdir/pxelinux.0");
}
unless (-r "$tftpdir/pxelinux.0") {
$::PXE_callback->({ errror => ["Unable to find pxelinux.0 from syslinux"], errorcode => [1] });
unless (-r "$globaltftpdir/pxelinux.0") {
$::PXE_callback->({ errror => ["Unable to find pxelinux.0 from syslinux or pxelinux"], errorcode => [1] });
return;
}
$errored = 0;
my %bphash;
my $inittime = 0;