vagrant-windows-sysprep 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc2d54aaf1260b1b665c8afc61aec19116513971ef3a582d66dadbf8b87bac1
-  data.tar.gz: 17831c91386bbac85c1cde8d97161931fe811a76ee5b014630784488c819ffab
+  metadata.gz: 2df8a8a18113901195e0aa019bc03a77aff26259c8db5e9b6ea6007f52885f51
+  data.tar.gz: 4c6f69bcee969e681750372b3ead7f0e3018710d57e917a67e393300479fe218
 SHA512:
-  metadata.gz: 7a34bf9e4cecfaf135997d18072b163cd14b670469bf23ca01d953c9fa8ded715c2ff098efec0825b6664db43d681cb4e20667b538c8643caa76ab1b1b94abe6
-  data.tar.gz: f40b0fde31aaff64913839a1367dab5a081373c09a40d8fd4eda712d1f189598c86cbbc95d7721af528de200612855eb1aea30f0a4432694437c18f013dcdee1
+  metadata.gz: 3715f58719f35db57da04c05ab36cc014ec3aab5bff5f09999e496c3d33d931c628adda47d92b6ad38972ea5a47ea6cc09e10b4cae07b0c6008f82a5960c2090
+  data.tar.gz: 5ad4390e3af22e74121273c8519bbb9ade57d9737f1661000f03e4861d0472efb584f52ba91e5673ed62ddbc5433a03db552160b4aed0170de337f93b5ba2d9b

data/lib/vagrant-windows-sysprep.rb

@@ -63,9 +63,11 @@ module VagrantPlugins
             end
 
             # wait for the machine to be shutdown.
-            # NB :poweroff is used by the VirtualBox provider.
-            # NB :shutoff  is used by the libvirt provider.
-            until [:poweroff, :shutoff].include? @machine.state.id
+            # NB :poweroff    is used by the VirtualBox provider.
+            # NB :shutoff     is used by the libvirt provider.
+            # NB :off         is used by the Hyper-V provider.
+            # NB :not_running is used by the VMware Desktop provider.
+            until [:poweroff, :shutoff, :off, :not_running].include? @machine.state.id
               sleep 10
             end
 

data/lib/vagrant-windows-sysprep/sysprep.ps1

@@ -21,6 +21,15 @@ if (!$ComputerName) {
 $unattendPath = "$PSScriptRoot\vagrant-windows-sysprep-unattend.xml"
 $unattendPs1Path = "$PSScriptRoot\vagrant-windows-sysprep-unattend.ps1"
 
+# sysprep renames the user that has the well-known Administrator SID
+# to the Administrator name, when $Username has that SID, we must
+# rename Administrator back to the $Username name.
+# NB this SID always has the format S-1-5-21-<domain>-500.
+# see https://support.microsoft.com/en-us/help/243330/well-known-security-identifiers-in-windows-operating-systems
+$administratorLocalUser = Get-LocalUser | Where-Object {$_.SID.Value -match '^S-1-5-21-.+-500$'}
+$enableAdministrator = $administratorLocalUser.Enabled
+$renameAdministratorToUsername = $administratorLocalUser.Name -eq $Username
+
 # NB doing an auto-logon after a sysprep has two effects:
 #    1. make Windows 10 1809 not ask for an account creation (regardless of the
 #       value of SkipUserOOBE/SkipMachineOOBE).
@@ -52,12 +61,9 @@ Set-Content `
             -replace '@@COMPUTERNAME@@',$ComputerName `
             -replace '@@USERNAME@@',$Username `
             -replace '@@PASSWORD@@',$Password `
-            -replace '@@UNATTENDPS1PATH@@',$unattendPs1Path `
+            -replace '@@UNATTENDPS1PATH@@',$unattendPs1Path
     )
-Set-Content `
-    -Encoding UTF8 `
-    -Path $unattendPs1Path `
-    -Value @'
+$unattendPs1 = @'
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
@@ -82,6 +88,16 @@ WARNING WARNING WARNING WARNING WARNING WARNING
 
 "@
 
+if ($enableAdministrator) {
+    Get-LocalUser -Name Administrator | Enable-LocalUser
+} else {
+    Get-LocalUser -Name Administrator | Disable-LocalUser
+}
+
+if ($renameAdministratorToUsername) {
+    Get-LocalUser -Name Administrator | Rename-LocalUser -NewName $Username
+}
+
 Write-Host 'Waiting for WinRM to be running...'
 while ((Get-Service WinRM).Status -ne 'Running') {
     Start-Sleep -Seconds 5
@@ -104,7 +120,14 @@ Remove-ItemProperty `
 
 Write-Host 'Logging off...'
 logoff
-'@
+'@ `
+    -replace '\$enableAdministrator',"$(if ($enableAdministrator) {'$true'} else {'$false'})" `
+    -replace '\$renameAdministratorToUsername',"$(if ($renameAdministratorToUsername) {'$true'} else {'$false'})" `
+    -replace '\$Username',"'$Username'"
+Set-Content `
+    -Encoding UTF8 `
+    -Path $unattendPs1Path `
+    -Value $unattendPs1
 
 Write-Host 'Syspreping...'
 C:/Windows/System32/Sysprep/sysprep.exe `

data/lib/vagrant-windows-sysprep/unattend.xml

@@ -41,8 +41,14 @@
                     <PlainText>true</PlainText>
                 </Password>
                 <Enabled>true</Enabled>
-                <Username>@@USERNAME@@</Username>
+                <Username>Administrator</Username>
             </AutoLogon>
+            <UserAccounts>
+                <AdministratorPassword>
+                    <Value>@@PASSWORD@@</Value>
+                    <PlainText>true</PlainText>
+                </AdministratorPassword>
+            </UserAccounts>
             <FirstLogonCommands>
                 <SynchronousCommand wcm:action="add">
                     <Order>1</Order>

data/lib/vagrant-windows-sysprep/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module WindowsSysprep
-    VERSION = "0.0.6"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-sysprep
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.10
 platform: ruby
 authors:
 - Rui Lopes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2021-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin for running Windows sysprep.