[Libosinfo] [PATCH v2 6/6] win8,installer: Tune based on variants

[Fabiano Fidêncio]

As Windows 8.1, Windows 8 (most likely) has to have the ProductKey
skipped during the WindowsPE phase of the script for the enterprise,
enterprise-debug and professional variants.

"Most likely" is said because I haven't been able to test the Windows 8
Professional variant as it needs a VLK and MSDN tells me that only
administrators can access keys in the Volume Licensing Service Center
(VLSC).

Also, I haven't been able to start an installation using none of the
debug ISOs, as the system reboots just a minute (or so) after booting
up. It seems to be a problem with the ISOs themselves, as I've
downloaded a few ISOs (different locales) and faced the same issue.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 data/install-script/microsoft.com/windows-unattend-desktop.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
index 310246f..a207c1d 100644
--- a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
@@ -150,12 +150,12 @@
          <UserData>
           <AcceptEula>true</AcceptEula>
           <xsl:choose>
-            <xsl:when test="os/version != 6.3"> <!-- Any Windows, but the Windows 8.1 -->
+            <xsl:when test="os/version < 6.2"> <!-- Windows 7 and older -->
               <ProductKey>
                 <Key><xsl:value-of select="config/reg-product-key"/></Key>
               </ProductKey>
             </xsl:when>
-            <xsl:otherwise> <!-- Windows 8.1 -->
+            <xsl:otherwise> <!-- Windows 8 and 8.1 -->
               <xsl:if test="count(media/variant) = 0 or (contains(media/variant, 'debug') and not(contains(media/variant, 'enterprise')))"> <!-- "No Variant" or "Debug" variant -->
                 <ProductKey>
                   <Key><xsl:value-of select="config/reg-product-key"/></Key>
-- 
2.7.4