Retry with local bcdboot.exe not only for old versions of bcdboot.exe (#406)

Nils98Ar · web-flow · commit 4a41923368ca · 2025-03-25T12:08:22.000+02:00
* Retry with local bcdboot.exe for new Windows versions (version &gt;= 6.2).
diff --git a/WinImageBuilder.psm1 b/WinImageBuilder.psm1
@@ -282,12 +282,16 @@ function Create-BCDBootConfig {
        }
     } else {
        $bcdbootOutput = & $bcdbootPath ${windowsDrive}\windows /s ${systemDrive} /v /f $diskLayout
+       # Retry using the local bcdboot path
+       if ($LASTEXITCODE) {
+           Write-Log "Retrying with bcdboot.exe from host"
+           $bcdbootOutput = & $bcdbootLocalPath ${windowsDrive}\windows /s ${systemDrive} /v /f $diskLayout
+       }
     }
     if ($LASTEXITCODE) {
         $ErrorActionPreference = "Stop"
         throw "BCDBoot failed with error: $bcdbootOutput"
     }
-
     Reset-BCDSearchOrder -systemDrive $systemDrive -windowsDrive $windowsDrive `
         -diskLayout $diskLayout
 

Original file line number	Diff line number	Diff line change
`@@ -282,12 +282,16 @@ function Create-BCDBootConfig {`
`282`	`282`	`}`
`283`	`283`	`} else {`
`284`	`284`	`$bcdbootOutput = & $bcdbootPath ${windowsDrive}\windows /s ${systemDrive} /v /f $diskLayout`
	`285`	`+ # Retry using the local bcdboot path`
	`286`	`+ if ($LASTEXITCODE) {`
	`287`	`+ Write-Log "Retrying with bcdboot.exe from host"`
	`288`	`+ $bcdbootOutput = & $bcdbootLocalPath ${windowsDrive}\windows /s ${systemDrive} /v /f $diskLayout`
	`289`	`+ }`
`285`	`290`	`}`
`286`	`291`	`if ($LASTEXITCODE) {`
`287`	`292`	`$ErrorActionPreference = "Stop"`
`288`	`293`	`throw "BCDBoot failed with error: $bcdbootOutput"`
`289`	`294`	`}`
`290`		`-`
`291`	`295`	Reset-BCDSearchOrder -systemDrive $systemDrive -windowsDrive $windowsDrive `
`292`	`296`	`-diskLayout $diskLayout`
`293`	`297`