[Libosinfo] [PATCHv2 3/4] win7,installer: Adapt for Windows 8

[Zeeshan Ali (Khattak)]

From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>

The presence of 'InstallFrom' in the XML breaks unattended installation
for Windows 8 and its not needed for Windows 7 now that we require
product key. 'ProductKey' is expected in different locations in the XML
by Windows 8 but same location works for Windows 7 as well.
---
 data/install-scripts/windows-unattend.xml | 45 +++++++++++--------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml
index 743d918..3549cff 100644
--- a/data/install-scripts/windows-unattend.xml
+++ b/data/install-scripts/windows-unattend.xml
@@ -112,12 +112,6 @@
 		</DiskConfiguration>
 		<ImageInstall>
 		  <OSImage>
-		    <InstallFrom>
-		      <MetaData wcm:action="add">
-			<Key>/IMAGE/INDEX</Key>
-			<Value>1</Value>
-		      </MetaData>
-		    </InstallFrom>
 		    <InstallTo>
 		      <DiskID>0</DiskID>
 		      <PartitionID>1</PartitionID>
@@ -127,6 +121,9 @@
 		</ImageInstall>
 		<UserData>
 		  <AcceptEula>true</AcceptEula>
+                    <ProductKey>
+                      <Key><xsl:value-of select="config/reg-product-key"/></Key>
+                    </ProductKey>
 		</UserData>
 	      </component>
 	      <component name="Microsoft-Windows-International-Core-WinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -198,15 +195,17 @@
 		</FirstLogonCommands>
 	      </component>
 	    </settings>
-	    <settings pass="specialize">
-	      <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<xsl:attribute name="processorArchitecture">
-		  <xsl:call-template name="arch"/>
-		</xsl:attribute>
+            <xsl:if test="os/version < 6.2">
+	      <settings pass="specialize">
+	        <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		  <xsl:attribute name="processorArchitecture">
+		    <xsl:call-template name="arch"/>
+		  </xsl:attribute>
 
-		<ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
-	      </component>
-	    </settings>
+		  <ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
+	        </component>
+	      </settings>
+            </xsl:if>
 	  </unattend>
 	</xsl:template>
       </xsl:stylesheet>
@@ -331,12 +330,6 @@
          </DiskConfiguration>
          <ImageInstall>
           <OSImage>
-           <InstallFrom>
-            <MetaData wcm:action="add">
-             <Key>/IMAGE/INDEX</Key>
-             <Value>1</Value>
-            </MetaData>
-           </InstallFrom>
            <InstallTo>
             <DiskID>0</DiskID>
             <PartitionID>1</PartitionID>
@@ -346,6 +339,9 @@
          </ImageInstall>
          <UserData>
           <AcceptEula>true</AcceptEula>
+           <ProductKey>
+            <Key><xsl:value-of select="config/reg-product-key"/></Key>
+           </ProductKey>
          </UserData>
         </component>
         <component name="Microsoft-Windows-International-Core-WinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -426,15 +422,6 @@
          </xsl:if>
         </component>
        </settings>
-       <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-         <xsl:attribute name="processorArchitecture">
-          <xsl:call-template name="arch"/>
-         </xsl:attribute>
-
-         <ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
-        </component>
-       </settings>
       </unattend>
      </xsl:template>
     </xsl:stylesheet>
-- 
1.8.1.2