Roy Golan has uploaded a new change for review. Change subject: core: fix sysprep architecture values ......................................................................
core: fix sysprep architecture values arch values don't match the OS ini question - x86 instead of amd64 for OSs which are 64 bit Change-Id: Id61fea5f128de054bfe143d9888751205fa080e4 Bug-Url: https://bugzilla.redhat.com/1066884 Signed-off-by: Roy Golan <rgo...@redhat.com> (cherry picked from commit b21e95affa4e0867ab675c1ffc733bfd35b761fb) --- M packaging/conf/sysprep/sysprep.2k8 M packaging/conf/sysprep/sysprep.2k8x64 2 files changed, 87 insertions(+), 87 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/26214/1 diff --git a/packaging/conf/sysprep/sysprep.2k8 b/packaging/conf/sysprep/sysprep.2k8 index 187aed9..434e70b 100644 --- a/packaging/conf/sysprep/sysprep.2k8 +++ b/packaging/conf/sysprep/sysprep.2k8 @@ -1,97 +1,78 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="specialize"> - <component name="Microsoft-Windows-UnattendedJoin" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <ComputerName>$ComputerName$</ComputerName> + <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <RegisteredOwner>User</RegisteredOwner> + </component> + <component name="Microsoft-Windows-UnattendedJoin" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <Identification> <Credentials> - <!-- Identification/JoinDomain --> <Domain>$JoinDomain$</Domain> - <!-- Identification/DomainAdminPassword--> <Password>$DomainAdminPassword$</Password> - <!-- Identification/DomainAdmin --> <Username>$DomainAdmin$</Username> </Credentials> - <JoinDomain>$JoinDomain$</JoinDomain> <DebugJoin>true</DebugJoin> + <JoinDomain>$JoinDomain$</JoinDomain> </Identification> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <!-- UserData/ComputerName --> - <ComputerName>$ComputerName$</ComputerName> - <!-- UserData/OrgName --> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> - <!-- UserData/FullName --> - <RegisteredOwner>User</RegisteredOwner> </component> </settings> <settings pass="oobeSystem"> - <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <!-- Proxy/ProxyEnabled --> + <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <HKLMProxyEnable>false</HKLMProxyEnable> </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <component name="Microsoft-Windows-International-Core" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UILanguageFallback>en-us</UILanguageFallback> + <UserLocale>en-us</UserLocale> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <Display> - <!-- Display/BitsPerPixel --> <ColorDepth>32</ColorDepth> - <!-- Display/Xresolution --> <HorizontalResolution>1024</HorizontalResolution> - <!-- Display/Vrefresh --> <RefreshRate>75</RefreshRate> - <!-- Display/Yresolution --> <VerticalResolution>768</VerticalResolution> </Display> <OOBE> - <SkipUserOOBE>true</SkipUserOOBE> <HideEULAPage>true</HideEULAPage> + <SkipUserOOBE>true</SkipUserOOBE> </OOBE> <UserAccounts> - <!-- GuiUnattended/AdminPassword --> <AdministratorPassword> - <Value>$AdminPassword$</Value> - <!-- GuiUnattended/EncryptedAdminPassword --> + <Value>$DomainAdminPassword$</Value> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> - <!-- GuiUnattended/TimeZone --> - <TimeZone>$TimeZone$</TimeZone> - <!-- UserData/OrgName --> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> - <!-- UserData/FullName --> + <RegisteredOrganization>$OrgName$</RegisteredOrganization> <RegisteredOwner>User</RegisteredOwner> - </component> - <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <!-- REgionalSettings/Language --> - <InputLocale>0409:00000409</InputLocale> - <SystemLocale>en-us</SystemLocale> - <UILanguage>en-us</UILanguage> - <UILanguageFallback>en-us</UILanguageFallback> - <UserLocale>en-us</UserLocale> + <TimeZone>$TimeZone$</TimeZone> </component> </settings> <settings pass="windowsPE"> - <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <UserData> - <!-- GuiUnattended/OemSkipWelcome --> - <AcceptEula>true</AcceptEula> - <FullName>User</FullName> - <Organization>$OrgName$</Organization> - <ProductKey> - <Key>$ProductKey$</Key> - <WillShowUI>Never</WillShowUI> - </ProductKey> - </UserData> - </component> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <SetupUILanguage> <UILanguage>en-us</UILanguage> </SetupUILanguage> - <!-- REgionalSettings/Language --> <InputLocale>0409:00000409</InputLocale> - <SystemLocale>en-us</SystemLocale> <UILanguage>en-us</UILanguage> + <SystemLocale>en-us</SystemLocale> <UILanguageFallback>en-us</UILanguageFallback> <UserLocale>en-us</UserLocale> </component> + <component name="Microsoft-Windows-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <UserData> + <ProductKey> + <Key>$ProductKey$</Key> + <WillShowUI>Never</WillShowUI> + </ProductKey> + <AcceptEula>true</AcceptEula> + <Organization>$OrgName$</Organization> + <FullName>User</FullName> + </UserData> + </component> </settings> - <cpi:offlineImage cpi:source="wim:c:/osc/sources/install.wim#Windows Longhorn SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> + <cpi:offlineImage cpi:source="catalog://catalogs/windows2008-x86/sources/install_windows longhorn serverenterprise.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> diff --git a/packaging/conf/sysprep/sysprep.2k8x64 b/packaging/conf/sysprep/sysprep.2k8x64 index 434e70b..187aed9 100644 --- a/packaging/conf/sysprep/sysprep.2k8x64 +++ b/packaging/conf/sysprep/sysprep.2k8x64 @@ -1,78 +1,97 @@ <?xml version="1.0" encoding="utf-8"?> <unattend xmlns="urn:schemas-microsoft-com:unattend"> <settings pass="specialize"> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <ComputerName>$ComputerName$</ComputerName> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> - <RegisteredOwner>User</RegisteredOwner> - </component> - <component name="Microsoft-Windows-UnattendedJoin" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <component name="Microsoft-Windows-UnattendedJoin" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <Identification> <Credentials> + <!-- Identification/JoinDomain --> <Domain>$JoinDomain$</Domain> + <!-- Identification/DomainAdminPassword--> <Password>$DomainAdminPassword$</Password> + <!-- Identification/DomainAdmin --> <Username>$DomainAdmin$</Username> </Credentials> - <DebugJoin>true</DebugJoin> <JoinDomain>$JoinDomain$</JoinDomain> + <DebugJoin>true</DebugJoin> </Identification> + </component> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <!-- UserData/ComputerName --> + <ComputerName>$ComputerName$</ComputerName> + <!-- UserData/OrgName --> + <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <!-- UserData/FullName --> + <RegisteredOwner>User</RegisteredOwner> </component> </settings> <settings pass="oobeSystem"> - <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <component name="Microsoft-Windows-IE-ClientNetworkProtocolImplementation" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <!-- Proxy/ProxyEnabled --> <HKLMProxyEnable>false</HKLMProxyEnable> </component> - <component name="Microsoft-Windows-International-Core" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <InputLocale>0409:00000409</InputLocale> - <SystemLocale>en-us</SystemLocale> - <UILanguage>en-us</UILanguage> - <UILanguageFallback>en-us</UILanguageFallback> - <UserLocale>en-us</UserLocale> - </component> - <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <Display> + <!-- Display/BitsPerPixel --> <ColorDepth>32</ColorDepth> + <!-- Display/Xresolution --> <HorizontalResolution>1024</HorizontalResolution> + <!-- Display/Vrefresh --> <RefreshRate>75</RefreshRate> + <!-- Display/Yresolution --> <VerticalResolution>768</VerticalResolution> </Display> <OOBE> - <HideEULAPage>true</HideEULAPage> <SkipUserOOBE>true</SkipUserOOBE> + <HideEULAPage>true</HideEULAPage> </OOBE> <UserAccounts> + <!-- GuiUnattended/AdminPassword --> <AdministratorPassword> - <Value>$DomainAdminPassword$</Value> + <Value>$AdminPassword$</Value> + <!-- GuiUnattended/EncryptedAdminPassword --> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> - <RegisteredOwner>User</RegisteredOwner> + <!-- GuiUnattended/TimeZone --> <TimeZone>$TimeZone$</TimeZone> + <!-- UserData/OrgName --> + <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <!-- UserData/FullName --> + <RegisteredOwner>User</RegisteredOwner> </component> - </settings> - <settings pass="windowsPE"> - <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <SetupUILanguage> - <UILanguage>en-us</UILanguage> - </SetupUILanguage> + <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <!-- REgionalSettings/Language --> <InputLocale>0409:00000409</InputLocale> - <UILanguage>en-us</UILanguage> <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> <UILanguageFallback>en-us</UILanguageFallback> <UserLocale>en-us</UserLocale> </component> - <component name="Microsoft-Windows-Setup" processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + </settings> + <settings pass="windowsPE"> + <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <UserData> - <ProductKey> - <Key>$ProductKey$</Key> - <WillShowUI>Never</WillShowUI> - </ProductKey> + <!-- GuiUnattended/OemSkipWelcome --> <AcceptEula>true</AcceptEula> - <Organization>$OrgName$</Organization> <FullName>User</FullName> + <Organization>$OrgName$</Organization> + <ProductKey> + <Key>$ProductKey$</Key> + <WillShowUI>Never</WillShowUI> + </ProductKey> </UserData> </component> + <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <SetupUILanguage> + <UILanguage>en-us</UILanguage> + </SetupUILanguage> + <!-- REgionalSettings/Language --> + <InputLocale>0409:00000409</InputLocale> + <SystemLocale>en-us</SystemLocale> + <UILanguage>en-us</UILanguage> + <UILanguageFallback>en-us</UILanguageFallback> + <UserLocale>en-us</UserLocale> + </component> </settings> - <cpi:offlineImage cpi:source="catalog://catalogs/windows2008-x86/sources/install_windows longhorn serverenterprise.clg" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> + <cpi:offlineImage cpi:source="wim:c:/osc/sources/install.wim#Windows Longhorn SERVERSTANDARD" xmlns:cpi="urn:schemas-microsoft-com:cpi" /> </unattend> -- To view, visit http://gerrit.ovirt.org/26214 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id61fea5f128de054bfe143d9888751205fa080e4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
