arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

Browse Source
This commit is contained in:
immarvin 2014-11-14 01:30:14 -08:00
commit 72739e890d
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-genesis-scripts/debian/control
View File

@ -8,6 +8,7 @@ Standards-Version: 3.9.2
Package: xcat-genesis-scripts
Architecture: amd64 ppc64el
Depends: xcat-genesis-base-amd64[any-amd64],xcat-genesis-base-ppc64[any-ppc64el]
Replaces: xcat-genesis-scripts-amd64[any-amd64]
Description: xCAT genesis
(Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions

3
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -231,6 +231,9 @@ sub subvars {
$inc =~ s/#INSTALL_SOURCES#/$source/g;
$inc =~ s/#INSTALL_SOURCES_IN_PRE#/$source_in_pre/g;
if (("ubuntu" eq $platform) || ("debian" eq $platform)) {
$inc =~ s/#INCLUDE_OSIMAGE_PKGDIR#/$pkgdirs[-1]/;
}
}
#ok, now do everything else..

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

@ -661,7 +661,7 @@ sub mkinstall
"$installroot/autoinst/" . $node,
$node,
$pkglistfile,
"",
$pkgdir,
$platform
);
}

2
xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
View File

@ -144,7 +144,7 @@ deb http://91.189.88.140/ubuntu-ports/ trusty-updates universe" >> /etc/apt/sour
uname -m |grep ppc64 >/dev/null
then
echo "ARCH=powerpc perl -x mlnxofedinstall $mlnxofed_options"
ARCH=powerpc perl -x mlnxofedinstall $mlnxofed_options
ARCH=powerpc perl -x mlnxofedinstall --without-fw-update $mlnxofed_options
sleep 1
service openibd restart
else

2
xCAT-server/share/xcat/install/ubuntu/compute.tmpl
View File

@ -18,7 +18,7 @@ d-i netcfg/dhcp_timeout string 120
d-i mirror/country string manual
d-i mirror/protocol string http
d-i mirror/http/directory string /install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch#
d-i mirror/http/directory string #INCLUDE_OSIMAGE_PKGDIR#
d-i mirror/http/proxy string
# Suite to install.

4
xCAT/postscripts/configib
View File

@ -604,10 +604,10 @@ then
do
ifdown $tmp > /dev/null 2>&1
sleep 2
ifup $tmp
ifup $tmp > /dev/null 2>&1
done
else
ifup $nic
ifup $nic > /dev/null 2>&1
fi
fi
done