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:
root 2014-11-13 19:00:19 -08:00
commit 738f891d61
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/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.