mirror of
https://github.com/ntdevlabs/tiny11builder.git
synced 2025-03-13 02:05:29 +00:00
fix: look for WOW6432Node first
- registry value from WOW6432Node is regarded first for setup
This commit is contained in:
parent
688458d458
commit
df16ad64f5
@ -733,7 +733,11 @@ Remove-Item "$mainOSDrive\tiny11\sources\install.wim" > $null 2>&1
|
|||||||
Write-Host "The tiny11 image is now completed. Proceeding with the making of the ISO..."
|
Write-Host "The tiny11 image is now completed. Proceeding with the making of the ISO..."
|
||||||
Write-Host "Creating ISO image..."
|
Write-Host "Creating ISO image..."
|
||||||
# Get Windows ADK path from registry(following Visual Studio's winsdk.bat approach).
|
# Get Windows ADK path from registry(following Visual Studio's winsdk.bat approach).
|
||||||
$WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null)
|
$WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null)
|
||||||
|
if ($null -eq $WinSDKPath) {
|
||||||
|
$WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null)
|
||||||
|
}
|
||||||
|
|
||||||
if ($null -ne $WinSDKPath) {
|
if ($null -ne $WinSDKPath) {
|
||||||
# Trim the following backslash for path concatenation.
|
# Trim the following backslash for path concatenation.
|
||||||
$WinSDKPath = $WinSDKPath.TrimEnd('\')
|
$WinSDKPath = $WinSDKPath.TrimEnd('\')
|
||||||
|
@ -436,7 +436,11 @@ Write-Host "Copying unattended file for bypassing MS account on OOBE..."
|
|||||||
Copy-Item -Path "$PSScriptRoot\autounattend.xml" -Destination "$ScratchDisk\tiny11\autounattend.xml" -Force | Out-Null
|
Copy-Item -Path "$PSScriptRoot\autounattend.xml" -Destination "$ScratchDisk\tiny11\autounattend.xml" -Force | Out-Null
|
||||||
Write-Host "Creating ISO image..."
|
Write-Host "Creating ISO image..."
|
||||||
# Get Windows ADK path from registry(following Visual Studio's winsdk.bat approach).
|
# Get Windows ADK path from registry(following Visual Studio's winsdk.bat approach).
|
||||||
$WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null)
|
$WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null)
|
||||||
|
if ($null -eq $WinSDKPath) {
|
||||||
|
$WinSDKPath = [Microsoft.Win32.Registry]::GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots", "KitsRoot10", $null)
|
||||||
|
}
|
||||||
|
|
||||||
if ($null -ne $WinSDKPath) {
|
if ($null -ne $WinSDKPath) {
|
||||||
# Trim the following backslash for path concatenation.
|
# Trim the following backslash for path concatenation.
|
||||||
$WinSDKPath = $WinSDKPath.TrimEnd('\')
|
$WinSDKPath = $WinSDKPath.TrimEnd('\')
|
||||||
|
Loading…
Reference in New Issue
Block a user