xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-23 11:40:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:xcat2/xcat-core into I5548

Browse Source
This commit is contained in:
xuweibj
2018-08-28 02:35:28 -04:00
parent d16be880e4 f7a3372a49
commit 32abba7a45
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@@ -8239,7 +8239,13 @@ sub loadsdrcache {
if (!open($fh, "<$file")) {
return (1);
}
$r = retrieve_fd($fh);
eval {
$r = retrieve_fd($fh);
};
if($@){
xCAT::MsgUtils->message("S", "loadsdrcache: Fatal error while retrieving data from $file, $@");
return 1;
}
unless ($r) { close($fh); return 1; }
unless ($r->{xcat_sdrcacheversion} and $r->{xcat_sdrcacheversion} == $cache_version) { close($fh); return 1; } #version mismatch

4
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@@ -201,7 +201,7 @@ if ($netdriver) {
if ($arch eq 'x86' or $arch eq 'x86_64') {
@ndrivers = qw/tg3 bnx2 bnx2x e1000 e1000e igb mlx_en virtio_net/;
} elsif ($arch eq 'ppc64el') {
@ndrivers = qw/bnx2 bnx2x e1000 e1000e igb mlx_en mlx4_en virtio_net/;
@ndrivers = qw/bnx2 bnx2x e1000 e1000e igb ibmveth ehea mlx_en mlx4_en virtio_net/;
} elsif ($arch eq 'ppc64') {
@ndrivers = qw/e1000 e1000e igb ibmveth ehea/;
} elsif ($arch eq 's390x') {
@@ -1653,7 +1653,7 @@ EOMS
# Workaround for Ubuntu 18.04 busybox bug
# https://bugs.launchpad.net/ubuntu/+source/busybox/+bug/1753572
# On Ubuntun 18.04, will use GNU cpio instead of busybox cpio
if ("ubuntu18.04" eq $osver) {
if ($osver = ~ /^18.04/) {
foreach ("bin/cpio") {
getlibs($_);
push @filestoadd, $_;