Merge branch 'master' of https://github.com/cloudbase/unattended-setup-scripts

Author: alexpilotti

Autounattend.xml

@@ -166,17 +166,19 @@
         </component>
         <component name="Microsoft-Windows-Deployment" 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">
             <RunSynchronous>
-                <!-- Download and install Cloudbase-Init -->
+                <!-- Download Cloudbase-Init -->
                 <RunSynchronousCommand wcm:action="add">
                     <Order>1</Order>
                     <Path>powershell -NoLogo -Command "Invoke-WebRequest -Uri http://www.cloudbase.it/downloads/CloudbaseInitSetup_Beta.msi -OutFile C:\Windows\Temp\CloudbaseInitSetup_Beta.msi"</Path>
                     <Description>Download Cloudbase-Init Setup</Description>
                 </RunSynchronousCommand>
+                <!--
                 <RunSynchronousCommand wcm:action="add">
                     <Order>2</Order>
                     <Path>msiexec /i C:\Windows\Temp\CloudbaseInitSetup.msi /qn /l*v C:\Windows\Temp\CloudbaseInitSetup_Beta.log</Path>
                     <Description>Execute tools deployment script</Description>
                 </RunSynchronousCommand>
+                -->
 
                 <!-- Download and install various utilities -->
                 <RunSynchronousCommand wcm:action="add">

UpdateAndSysprep.ps1

@@ -1,3 +1,6 @@
+Param(
+  [switch]$InstallCloudbaseInit
+)
 $ErrorActionPreference = "Stop"
 
 Get-WUInstall -AcceptAll -IgnoreReboot
@@ -9,5 +12,21 @@ else
 {
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name Unattend*
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name AutoLogonCount
-    C:\Windows\System32\Sysprep\Sysprep.exe /generalize /oobe /shutdown /unattend:C:\Windows\Temp\Unattend.xml
+    if($InstallCloudbaseInit)
+    {
+        Invoke-WebRequest -Uri http://www.cloudbase.it/downloads/CloudbaseInitSetup_Beta.msi -OutFile C:\Windows\Temp\CloudbaseInitSetup_Beta.msi
+        Write-Host "Sleep 60 seconds"
+        Start-Sleep -s 60
+        Write-Host "Install Cloudbase-Init"
+        Start-Process -FilePath msiexec -ArgumentList "/i C:\Windows\Temp\CloudbaseInitSetup.msi /qn /l*v C:\Windows\Temp\CloudbaseInitSetup_Beta.log" -Wait
+        Write-Host "Sleep 60 seconds take 2"
+        Start-Sleep -s 60
+        Write-Host "Install Cloudbase-Init take 2"
+        Start-Process -FilePath msiexec -ArgumentList "/i C:\Windows\Temp\CloudbaseInitSetup.msi /qn /l*v C:\Windows\Temp\CloudbaseInitSetup_Beta2.log" -Wait
+        C:\Windows\System32\Sysprep\Sysprep.exe /generalize /oobe /shutdown /unattend:C:\Program\ Files\ (x86)\Cloudbase\ Solutions\Cloudbase-Init\conf\Unattend.xml
+    }
+    else
+    {
+        C:\Windows\System32\Sysprep\Sysprep.exe /generalize /oobe /shutdown /unattend:C:\Windows\Temp\Unattend.xml
+    }
 }