Fix characterization of hyper-v

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15037 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-02-01 19:11:46 +00:00
parent 91d1302622
commit 885277c218
4 changed files with 12 additions and 2 deletions

View File

@ -562,6 +562,10 @@ sub update_tables_with_templates
$osname="windows";
$ostype="Windows";
$imagetype="windows";
} elsif ($osver =~ /^hyperv/) {
$osname="hyperv";
$ostype="Windows";
$imagetype="windows";
} else {
until (-r "$::XCATROOT/share/xcat/install/$osname/" or not $osname) {
chop($osname);

View File

@ -310,8 +310,14 @@ sub mkinstall
next;
}
my $tmplfile=xCAT::SvrUtils::get_tmpl_file_name("$installroot/custom/install/windows", $profile, $os, $arch);
if (! $tmplfile) { $tmplfile=xCAT::SvrUtils::get_tmpl_file_name("$::XCATROOT/share/xcat/install/windows", $profile, $os, $arch); }
my $custmplpath = "$installroot/custom/install/windows";
my $tmplpath = "$::XCATROOT/share/xcat/install/windows";
if ($os =~ /^hyperv/) {
$custmplpath = "$installroot/custom/install/hyperv";
$tmplpath = "$::XCATROOT/share/xcat/install/hyperv";
}
my $tmplfile=xCAT::SvrUtils::get_tmpl_file_name($custmplpath, $profile, $os, $arch);
if (! $tmplfile) { $tmplfile=xCAT::SvrUtils::get_tmpl_file_name($tmplpath, $profile, $os, $arch); }
unless ( -r "$tmplfile")
{
$callback->(