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: I3a834c265f513fd7c9628cf0c7179f8118904447
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, 73 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/31974/1

diff --git a/packaging/conf/sysprep/sysprep.2k12x64 
b/packaging/conf/sysprep/sysprep.2k12x64
index 67f1b99..f336792 100644
--- a/packaging/conf/sysprep/sysprep.2k12x64
+++ b/packaging/conf/sysprep/sysprep.2k12x64
@@ -2,19 +2,19 @@
 <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>
+                <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain>
             </Identification>
         </component>
     </settings>
@@ -42,13 +42,13 @@
             </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">
@@ -65,11 +65,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>
                     <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 434e70b..5773c85 100644
--- a/packaging/conf/sysprep/sysprep.2k8
+++ b/packaging/conf/sysprep/sysprep.2k8
@@ -2,19 +2,19 @@
 <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>
+                <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain>
             </Identification>
         </component>
     </settings>
@@ -42,13 +42,13 @@
             </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">
@@ -65,11 +65,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>
                     <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 187aed9..d272a40 100644
--- a/packaging/conf/sysprep/sysprep.2k8x64
+++ b/packaging/conf/sysprep/sysprep.2k8x64
@@ -5,21 +5,21 @@
             <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>
             </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>
@@ -47,15 +47,15 @@
             <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>
@@ -74,9 +74,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 8172033..6a455e8 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>
@@ -30,11 +30,11 @@
         <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>
+                <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain>
             </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";>
@@ -45,8 +45,8 @@
                 <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>en-US</InputLocale>
@@ -59,13 +59,13 @@
         <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>
diff --git a/packaging/conf/sysprep/sysprep.w7x64 
b/packaging/conf/sysprep/sysprep.w7x64
index a31242a..fbaf4fc 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>
@@ -35,8 +35,8 @@
                 <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>en-US</InputLocale>
@@ -47,11 +47,11 @@
         <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>
+                <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain>
             </Identification>
         </component>
     </settings>
@@ -70,13 +70,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 20237a5..e0591a1 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>
@@ -30,11 +30,11 @@
         <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>
+                <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain>
             </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";>
@@ -45,8 +45,8 @@
                 <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>en-US</InputLocale>
@@ -59,13 +59,13 @@
         <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>
diff --git a/packaging/conf/sysprep/sysprep.w8x64 
b/packaging/conf/sysprep/sysprep.w8x64
index 63e06ba..920ce60 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>
@@ -35,8 +35,8 @@
                 <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>en-US</InputLocale>
@@ -47,11 +47,11 @@
         <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>
+                <JoinDomain><![CDATA[$JoinDomain$]]></JoinDomain>
             </Identification>
         </component>
     </settings>
@@ -70,13 +70,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/31974
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a834c265f513fd7c9628cf0c7179f8118904447
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Shahar Havivi <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to