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

Merge pull request #1107 from zet809/fix_issue_1084

Browse Source 
fix issue 1084: [FVT] 2.12 mknb failed on ubuntu 16.04 x86 env
This commit is contained in:
Xiaopeng Wang 2016-05-13 18:18:30 +08:00
commit 6e6c63c815
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,17 +198,13 @@ CREAT_CONF_FILE:
chmod(0755,"$tftpdir/xcat/xnba/nets");
mkpath("$tftpdir/pxelinux.cfg");
chmod(0755,"$tftpdir/pxelinux.cfg");
if (! -r "$tftpdir/pxelinux.0") {
unless (-r "/usr/lib/syslinux/pxelinux.0" or -r "/usr/share/syslinux/pxelinux.0") {
$callback->({error=>["Unable to find pxelinux.0 "],errorcode=>[1]});
return;
}
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");
if (-r "/usr/lib/syslinux/pxelinux.0") {
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");
}
if (-r "$tftpdir/pxelinux.0") {
chmod(0644,"$tftpdir/pxelinux.0");
}
} elsif ($arch =~ /ppc/) {
mkpath("$tftpdir/pxelinux.cfg/p/");