diff options
| author | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2013-01-02 22:37:17 +0200 |
|---|---|---|
| committer | Zeeshan Ali (Khattak) <zeeshanak@gnome.org> | 2013-03-04 17:13:49 +0200 |
| commit | c5d23e51ad195ee51542471db9426f2f91243f30 (patch) | |
| tree | d4b94e1efcafff9d179dc565c5737493ba93a62a | |
| parent | 0af474b689667b9f772c00c5bb87b3e05334c19f (diff) | |
win7,installer: Adapt for Windows 8
Win8 seems to require Microsoft-Windows-Setup/UserData/ProductKey/Key to
be set, which seems to be exclusive with using
Microsoft-Windows-Setup/ImageInstall/OSImage/InstallFrom/MetaData (or at
least some care needs to be taken when using both together). As letting
the Windows installer decide on which OSImage to use from the product key
rather than hardcoding use of the first OSImage on the ISO seems more
robust, we switch from InstallFrom installation image selection to
ProductKey installation image selection.
Co-author: Christophe Fergeau <cfergeau@redhat.com>
| -rw-r--r-- | data/install-scripts/windows-unattend.xml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows-unattend.xml index 9ad324f..93fafa4 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"> @@ -343,12 +340,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> @@ -358,6 +349,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"> |