From 5d963f0fee63d50462b3c9e7e8bcbd28f44ca1f2 Mon Sep 17 00:00:00 2001 From: jjohnson2 Date: Thu, 5 Feb 2015 13:37:21 -0500 Subject: [PATCH] Recognize more variants of Windows 2012 Windows 2012 R2 and updates can take a number of forms, be more forgiving. --- xCAT-server/lib/xcat/plugins/windows.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/windows.pm b/xCAT-server/lib/xcat/plugins/windows.pm index 102e07fe2..cd3e83425 100644 --- a/xCAT-server/lib/xcat/plugins/windows.pm +++ b/xCAT-server/lib/xcat/plugins/windows.pm @@ -742,11 +742,9 @@ sub copycd $darch = "x86_64"; } elsif (/BuildBranch=win7_rtm/){ $distname = "win7"; - } elsif (/BuildBranch=winblue_rtm/){ + } elsif (/BuildBranch=winblue_r/){ if (-r $mntpath . "/sources/background_svr.bmp") { - if (! -r $mntpath . "/sources/EI.CFG") { - $distname = "win2012r2"; - } + $distname = "win2012r2"; } } elsif (/BuildBranch=win8_rtm/){ if (-r $mntpath . "/sources/background_cli.bmp") {