From 1da0ce688f32fc015e4569895109800e708971cb Mon Sep 17 00:00:00 2001 From: Christopher Boumenot Date: Fri, 29 Sep 2017 12:39:52 -0700 Subject: [PATCH] azure: sysprep improvements for Windows examples --- examples/azure/windows.json | 3 ++- examples/azure/windows_custom_image.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/azure/windows.json b/examples/azure/windows.json index 8493f82cb..23bd66b26 100644 --- a/examples/azure/windows.json +++ b/examples/azure/windows.json @@ -38,7 +38,8 @@ "type": "powershell", "inline": [ "if( Test-Path $Env:SystemRoot\\windows\\system32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\windows\\system32\\Sysprep\\unattend.xml -Force}", - "& $Env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /shutdown /quiet" + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" ] }] } diff --git a/examples/azure/windows_custom_image.json b/examples/azure/windows_custom_image.json index 018ba34d1..448340e19 100644 --- a/examples/azure/windows_custom_image.json +++ b/examples/azure/windows_custom_image.json @@ -37,7 +37,8 @@ "type": "powershell", "inline": [ "if( Test-Path $Env:SystemRoot\\windows\\system32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\windows\\system32\\Sysprep\\unattend.xml -Force}", - "& $Env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /shutdown /quiet" + "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", + "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" ] }] }