Shahar Havivi has uploaded a new change for review. Change subject: backend: sysprep custom variables should be in CDATA section ......................................................................
backend: sysprep custom variables should be in CDATA section for handling special characters we need to put all inputs inside xml CDATA section. Change-Id: I941e1422077383386ee788e75ae5ad38d1de39a2 Bug-Url: https://bugzilla.redhat.com/1122160 Signed-off-by: Shahar Havivi <[email protected]> --- M packaging/conf/sysprep/sysprep.2k12x64 M packaging/conf/sysprep/sysprep.2k8 M packaging/conf/sysprep/sysprep.2k8x64 M packaging/conf/sysprep/sysprep.w7 M packaging/conf/sysprep/sysprep.w7x64 M packaging/conf/sysprep/sysprep.w8 M packaging/conf/sysprep/sysprep.w8x64 7 files changed, 146 insertions(+), 146 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/31973/1 diff --git a/packaging/conf/sysprep/sysprep.2k12x64 b/packaging/conf/sysprep/sysprep.2k12x64 index ca4c710..2e4cef8 100644 --- a/packaging/conf/sysprep/sysprep.2k12x64 +++ b/packaging/conf/sysprep/sysprep.2k12x64 @@ -2,20 +2,20 @@ <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> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> + <RegisteredOrganization><![CDATA[$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> - <Domain>$JoinDomain$</Domain> - <Password>$DomainAdminPassword$</Password> - <Username>$DomainAdmin$</Username> + <Domain><![CDATA[$JoinDomain$]]></Domain> + <Password><![CDATA[$DomainAdminPassword$]]></Password> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> <DebugJoin>true</DebugJoin> - <JoinDomain>$JoinDomain$</JoinDomain> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </Identification> </component> </settings> @@ -25,10 +25,10 @@ </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>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>$UserLocale$</UserLocale> + <UserLocale><![CDATA[$UserLocale$]]></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> @@ -43,34 +43,34 @@ </OOBE> <UserAccounts> <AdministratorPassword> - <Value>$DomainAdminPassword$</Value> + <Value><![CDATA[$DomainAdminPassword$]]></Value> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <RegisteredOrganization><![CDATA[$OrgName$]]></RegisteredOrganization> <RegisteredOwner>User</RegisteredOwner> - <TimeZone>$TimeZone$</TimeZone> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> </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>$SetupUiLanguageUiLanguage$</UILanguage> + <UILanguage><![CDATA[$SetupUiLanguageUiLanguage$]]></UILanguage> </SetupUILanguage> <InputLocale>0409:00000409</InputLocale> - <UILanguage>$UILanguage$</UILanguage> - <SystemLocale>$SystemLocale$</SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>$UserLocale$</UserLocale> + <UserLocale><![CDATA[$UserLocale$]]></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> + <Key><![CDATA[$ProductKey$]]></Key> <WillShowUI>Never</WillShowUI> </ProductKey> <AcceptEula>true</AcceptEula> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> <FullName>User</FullName> </UserData> </component> diff --git a/packaging/conf/sysprep/sysprep.2k8 b/packaging/conf/sysprep/sysprep.2k8 index 051543b..b444cea 100644 --- a/packaging/conf/sysprep/sysprep.2k8 +++ b/packaging/conf/sysprep/sysprep.2k8 @@ -2,20 +2,20 @@ <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> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> + <RegisteredOrganization><![CDATA[$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> - <Domain>$JoinDomain$</Domain> - <Password>$DomainAdminPassword$</Password> - <Username>$DomainAdmin$</Username> + <Domain><![CDATA[$JoinDomain$]]></Domain> + <Password><![CDATA[$DomainAdminPassword$]]></Password> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> <DebugJoin>true</DebugJoin> - <JoinDomain>$JoinDomain$</JoinDomain> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </Identification> </component> </settings> @@ -43,34 +43,34 @@ </OOBE> <UserAccounts> <AdministratorPassword> - <Value>$DomainAdminPassword$</Value> + <Value><![CDATA[$DomainAdminPassword$]]></Value> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <RegisteredOrganization><![CDATA[$OrgName$]]></RegisteredOrganization> <RegisteredOwner>User</RegisteredOwner> - <TimeZone>$TimeZone$</TimeZone> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> </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>$SetupUiLanguageUiLanguage$</UILanguage> + <UILanguage><![CDATA[$SetupUiLanguageUiLanguage$]]></UILanguage> </SetupUILanguage> <InputLocale>0409:00000409</InputLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> <UILanguageFallback>en-US</UILanguageFallback> - <UserLocale>$UserLocale$</UserLocale> + <UserLocale><![CDATA[$UserLocale$]]></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> + <Key><![CDATA[$ProductKey$]]></Key> <WillShowUI>Never</WillShowUI> </ProductKey> <AcceptEula>true</AcceptEula> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> <FullName>User</FullName> </UserData> </component> diff --git a/packaging/conf/sysprep/sysprep.2k8x64 b/packaging/conf/sysprep/sysprep.2k8x64 index cff0260..77ae75a 100644 --- a/packaging/conf/sysprep/sysprep.2k8x64 +++ b/packaging/conf/sysprep/sysprep.2k8x64 @@ -5,22 +5,22 @@ <Identification> <Credentials> <!-- Identification/JoinDomain --> - <Domain>$JoinDomain$</Domain> + <Domain><![CDATA[$JoinDomain$]]></Domain> <!-- Identification/DomainAdminPassword--> - <Password>$DomainAdminPassword$</Password> + <Password><![CDATA[$DomainAdminPassword$]]></Password> <!-- Identification/DomainAdmin --> - <Username>$DomainAdmin$</Username> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> - <JoinDomain>$JoinDomain$</JoinDomain> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> <DebugJoin>true</DebugJoin> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </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> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> <!-- UserData/OrgName --> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <RegisteredOrganization><![CDATA[$OrgName$]]></RegisteredOrganization> <!-- UserData/FullName --> <RegisteredOwner>User</RegisteredOwner> </component> @@ -48,25 +48,25 @@ <UserAccounts> <!-- GuiUnattended/AdminPassword --> <AdministratorPassword> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <!-- GuiUnattended/EncryptedAdminPassword --> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> <!-- GuiUnattended/TimeZone --> - <TimeZone>$TimeZone$</TimeZone> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> <!-- UserData/OrgName --> - <RegisteredOrganization>$OrgName$</RegisteredOrganization> + <RegisteredOrganization><![CDATA[$OrgName$]]></RegisteredOrganization> <!-- UserData/FullName --> <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>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> <UILanguageFallback>en-us</UILanguageFallback> - <UserLocale>$UserLocale$</UserLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> </component> </settings> <settings pass="windowsPE"> @@ -75,9 +75,9 @@ <!-- GuiUnattended/OemSkipWelcome --> <AcceptEula>true</AcceptEula> <FullName>User</FullName> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> <ProductKey> - <Key>$ProductKey$</Key> + <Key><![CDATA[$ProductKey$]]></Key> <WillShowUI>Never</WillShowUI> </ProductKey> </UserData> diff --git a/packaging/conf/sysprep/sysprep.w7 b/packaging/conf/sysprep/sysprep.w7 index 4e4c1e7..01c7b32 100644 --- a/packaging/conf/sysprep/sysprep.w7 +++ b/packaging/conf/sysprep/sysprep.w7 @@ -4,11 +4,11 @@ <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> + <Key><![CDATA[$ProductKey$]]></Key> </ProductKey> <AcceptEula>true</AcceptEula> <FullName>"user"</FullName> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> </UserData> <ImageInstall> <OSImage> @@ -18,24 +18,24 @@ </component> <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>$SetupUiLanguageUiLanguage$</UILanguage> + <UILanguage><![CDATA[$SetupUiLanguageUiLanguage$]]></UILanguage> </SetupUILanguage> - <InputLocale>$InputLocale$</InputLocale> - <UILanguage>$UILanguage$</UILanguage> - <SystemLocale>$SystemLocale$</SystemLocale> - <UserLocale>$UserLocale$</UserLocale> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> </component> </settings> <settings pass="specialize"> <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> - <Domain>$JoinDomain$</Domain> - <Password>$DomainAdminPassword$</Password> - <Username>$DomainAdmin$</Username> + <Domain><![CDATA[$JoinDomain$]]></Domain> + <Password><![CDATA[$DomainAdminPassword$]]></Password> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> - <JoinDomain>$JoinDomain$</JoinDomain> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </Identification> </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";> @@ -46,27 +46,27 @@ <RefreshRate>75</RefreshRate> <VerticalResolution>768</VerticalResolution> </Display> - <ComputerName>$ComputerName$</ComputerName> - <TimeZone>$TimeZone$</TimeZone> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> </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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </component> </settings> <settings pass="oobeSystem"> <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";> <UserAccounts> <AdministratorPassword> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </AdministratorPassword> <LocalAccounts> <LocalAccount wcm:action="add"> <Password> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </Password> <DisplayName>user</DisplayName> @@ -82,10 +82,10 @@ </OOBE> </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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </component> </settings> <cpi:offlineImage cpi:source="wim:d:/sources/install.wim#Windows 7 ENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi"/> diff --git a/packaging/conf/sysprep/sysprep.w7x64 b/packaging/conf/sysprep/sysprep.w7x64 index 1361a27..48ea5ee 100644 --- a/packaging/conf/sysprep/sysprep.w7x64 +++ b/packaging/conf/sysprep/sysprep.w7x64 @@ -4,11 +4,11 @@ <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> + <Key><![CDATA[$ProductKey$]]></Key> </ProductKey> <AcceptEula>true</AcceptEula> <FullName>"user"</FullName> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> </UserData> <ImageInstall> <OSImage> @@ -18,12 +18,12 @@ </component> <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>$SetupUiLanguageUiLanguage$</UILanguage> + <UILanguage><![CDATA[$SetupUiLanguageUiLanguage$]]></UILanguage> </SetupUILanguage> - <InputLocale>$InputLocale$</InputLocale> - <UILanguage>$UILanguage$</UILanguage> - <SystemLocale>$SystemLocale$</SystemLocale> - <UserLocale>$UserLocale$</UserLocale> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> </component> </settings> <settings pass="specialize"> @@ -35,33 +35,33 @@ <RefreshRate>75</RefreshRate> <VerticalResolution>768</VerticalResolution> </Display> - <ComputerName>$ComputerName$</ComputerName> - <TimeZone>$TimeZone$</TimeZone> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> </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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </component> <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> - <Domain>$JoinDomain$</Domain> - <Password>$DomainAdminPassword$</Password> - <Username>$DomainAdmin$</Username> + <Domain><![CDATA[$JoinDomain$]]></Domain> + <Password><![CDATA[$DomainAdminPassword$]]></Password> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> - <JoinDomain>$JoinDomain$</JoinDomain> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </Identification> </component> </settings> <settings pass="oobeSystem"> <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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </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";> <OOBE> @@ -71,13 +71,13 @@ </OOBE> <UserAccounts> <AdministratorPassword> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </AdministratorPassword> <LocalAccounts> <LocalAccount wcm:action="add"> <Password> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </Password> <Group>administrators</Group> diff --git a/packaging/conf/sysprep/sysprep.w8 b/packaging/conf/sysprep/sysprep.w8 index 941e7ea..dc59f15 100644 --- a/packaging/conf/sysprep/sysprep.w8 +++ b/packaging/conf/sysprep/sysprep.w8 @@ -4,11 +4,11 @@ <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> + <Key><![CDATA[$ProductKey$]]></Key> </ProductKey> <AcceptEula>true</AcceptEula> <FullName>"user"</FullName> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> </UserData> <ImageInstall> <OSImage> @@ -18,24 +18,24 @@ </component> <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>$SetupUiLanguageUiLanguage$</UILanguage> + <UILanguage><![CDATA[$SetupUiLanguageUiLanguage$]]></UILanguage> </SetupUILanguage> - <InputLocale>$InputLocale$</InputLocale> - <UILanguage>$UILanguage$</UILanguage> - <SystemLocale>$SystemLocale$</SystemLocale> - <UserLocale>$UserLocale$</UserLocale> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> </component> </settings> <settings pass="specialize"> <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> - <Domain>$JoinDomain$</Domain> - <Password>$DomainAdminPassword$</Password> - <Username>$DomainAdmin$</Username> + <Domain><![CDATA[$JoinDomain$]]></Domain> + <Password><![CDATA[$DomainAdminPassword$]]></Password> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> - <JoinDomain>$JoinDomain$</JoinDomain> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </Identification> </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";> @@ -46,27 +46,27 @@ <RefreshRate>75</RefreshRate> <VerticalResolution>768</VerticalResolution> </Display> - <ComputerName>$ComputerName$</ComputerName> - <TimeZone>$TimeZone$</TimeZone> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> </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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$UILanguage$</SystemLocale> - <UILanguage>$SystemLocale$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$UILanguage$]]></SystemLocale> + <UILanguage><![CDATA[$SystemLocale$]]></UILanguage> </component> </settings> <settings pass="oobeSystem"> <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";> <UserAccounts> <AdministratorPassword> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </AdministratorPassword> <LocalAccounts> <LocalAccount wcm:action="add"> <Password> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </Password> <DisplayName>user</DisplayName> @@ -82,10 +82,10 @@ </OOBE> </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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </component> </settings> <cpi:offlineImage cpi:source="wim:d:/sources/install.wim#Windows 8 ENTERPRISE" xmlns:cpi="urn:schemas-microsoft-com:cpi"/> diff --git a/packaging/conf/sysprep/sysprep.w8x64 b/packaging/conf/sysprep/sysprep.w8x64 index b7b0fb3..6e09574 100644 --- a/packaging/conf/sysprep/sysprep.w8x64 +++ b/packaging/conf/sysprep/sysprep.w8x64 @@ -4,11 +4,11 @@ <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> + <Key><![CDATA[$ProductKey$]]></Key> </ProductKey> <AcceptEula>true</AcceptEula> <FullName>"user"</FullName> - <Organization>$OrgName$</Organization> + <Organization><![CDATA[$OrgName$]]></Organization> </UserData> <ImageInstall> <OSImage> @@ -18,12 +18,12 @@ </component> <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>$SetupUiLanguageUiLanguage$</UILanguage> + <UILanguage><![CDATA[$SetupUiLanguageUiLanguage$]]></UILanguage> </SetupUILanguage> - <InputLocale>$InputLocale$</InputLocale> - <UILanguage>$UILanguage$</UILanguage> - <SystemLocale>$SystemLocale$</SystemLocale> - <UserLocale>$UserLocale$</UserLocale> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> </component> </settings> <settings pass="specialize"> @@ -35,33 +35,33 @@ <RefreshRate>75</RefreshRate> <VerticalResolution>768</VerticalResolution> </Display> - <ComputerName>$ComputerName$</ComputerName> - <TimeZone>$TimeZone$</TimeZone> + <ComputerName><![CDATA[$ComputerName$]]></ComputerName> + <TimeZone><![CDATA[$TimeZone$]]></TimeZone> </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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </component> <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> - <Domain>$JoinDomain$</Domain> - <Password>$DomainAdminPassword$</Password> - <Username>$DomainAdmin$</Username> + <Domain><![CDATA[$JoinDomain$]]></Domain> + <Password><![CDATA[$DomainAdminPassword$]]></Password> + <Username><![CDATA[$DomainAdmin$]]></Username> </Credentials> - <JoinDomain>$JoinDomain$</JoinDomain> - <MachineObjectOU>$MachineObjectOU$</MachineObjectOU> + <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain> + <MachineObjectOU><![CDATA[$MachineObjectOU$]]></MachineObjectOU> </Identification> </component> </settings> <settings pass="oobeSystem"> <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>$InputLocale$</InputLocale> - <UserLocale>$UserLocale$</UserLocale> - <SystemLocale>$SystemLocale$</SystemLocale> - <UILanguage>$UILanguage$</UILanguage> + <InputLocale><![CDATA[$InputLocale$]]></InputLocale> + <UserLocale><![CDATA[$UserLocale$]]></UserLocale> + <SystemLocale><![CDATA[$SystemLocale$]]></SystemLocale> + <UILanguage><![CDATA[$UILanguage$]]></UILanguage> </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";> <OOBE> @@ -71,13 +71,13 @@ </OOBE> <UserAccounts> <AdministratorPassword> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </AdministratorPassword> <LocalAccounts> <LocalAccount wcm:action="add"> <Password> - <Value>$AdminPassword$</Value> + <Value><![CDATA[$AdminPassword$]]></Value> <PlainText>true</PlainText> </Password> <Group>administrators</Group> -- To view, visit http://gerrit.ovirt.org/31973 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I941e1422077383386ee788e75ae5ad38d1de39a2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
