ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-06-14 02:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Switches to Windows ADK DISM CLI for adding Windows packages

Browse Source 
Replaces the native PowerShell command for adding Windows packages with direct command-line invocations of the Deployment Image Servicing and Management (DISM) tool. This fixes an issue introduced by the March 31, 2026 OOB update that persists in the April 2026 2B update where Add-WindowsPackage fails due to issues with CBS. Using native dism fixes the issue.
This commit is contained in:
rbalsleyMSFT
2026-04-14 14:56:02 -07:00
parent 7bd5decc62
commit 28297f3a0e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/BuildFFUVM.ps1
+14 -10
View File
@@ -3708,7 +3708,8 @@ function New-PEMedia {
foreach ($Package in $Packages) { foreach ($Package in $Packages) {
$PackagePath = Join-Path $PackagePathBase $Package $PackagePath = Join-Path $PackagePathBase $Package
WriteLog "Adding Package $Package" WriteLog "Adding Package $Package"
Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null # Add-WindowsPackage -Path "$WinPEFFUPath\mount" -PackagePath $PackagePath | Out-Null
Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WinPEFFUPath\mount /Add-Package /PackagePath:$PackagePath" | Out-Null
WriteLog "Adding package complete" WriteLog "Adding package complete"
} }
WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media" WriteLog "Copying $FFUDevelopmentPath\WinPEDeployFFUFiles\* to WinPE deploy media"
@@ -7404,10 +7405,8 @@ try {
if ($WindowsRelease -eq 2016 -and $installationType -eq "Server") { if ($WindowsRelease -eq 2016 -and $installationType -eq "Server") {
WriteLog 'WindowsRelease is 2016, adding SSU first' WriteLog 'WindowsRelease is 2016, adding SSU first'
WriteLog "Adding SSU to $WindowsPartition" WriteLog "Adding SSU to $WindowsPartition"
# Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath -PreventPending | Out-Null # Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
# Commenting out -preventpending as it causes an issue with the SSU being applied Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$SSUFilePath" | Out-Null
# Seems to be because of the registry being mounted per dism.log
Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
WriteLog "SSU added to $WindowsPartition" WriteLog "SSU added to $WindowsPartition"
# WriteLog "Removing $SSUFilePath" # WriteLog "Removing $SSUFilePath"
# Remove-Item -Path $SSUFilePath -Force | Out-Null # Remove-Item -Path $SSUFilePath -Force | Out-Null
@@ -7416,7 +7415,8 @@ try {
if ($WindowsRelease -in 2016, 2019, 2021 -and $isLTSC) { if ($WindowsRelease -in 2016, 2019, 2021 -and $isLTSC) {
WriteLog "WindowsRelease is $WindowsRelease and is $WindowsSKU, adding SSU first" WriteLog "WindowsRelease is $WindowsRelease and is $WindowsSKU, adding SSU first"
WriteLog "Adding SSU to $WindowsPartition" WriteLog "Adding SSU to $WindowsPartition"
Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null # Add-WindowsPackage -Path $WindowsPartition -PackagePath $SSUFilePath | Out-Null
Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$SSUFilePath" | Out-Null
WriteLog "SSU added to $WindowsPartition" WriteLog "SSU added to $WindowsPartition"
# WriteLog "Removing $SSUFilePath" # WriteLog "Removing $SSUFilePath"
# Remove-Item -Path $SSUFilePath -Force | Out-Null # Remove-Item -Path $SSUFilePath -Force | Out-Null
@@ -7429,23 +7429,27 @@ try {
} }
else { else {
WriteLog "Adding $CUPath to $WindowsPartition" WriteLog "Adding $CUPath to $WindowsPartition"
Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPath | Out-Null # Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPath | Out-Null
Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$CUPath" | Out-Null
WriteLog "$CUPath added to $WindowsPartition" WriteLog "$CUPath added to $WindowsPartition"
} }
} }
if ($UpdatePreviewCU) { if ($UpdatePreviewCU) {
WriteLog "Adding $CUPPath to $WindowsPartition" WriteLog "Adding $CUPPath to $WindowsPartition"
Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPPath | Out-Null # Add-WindowsPackage -Path $WindowsPartition -PackagePath $CUPPath | Out-Null
Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$CUPPath" | Out-Null
WriteLog "$CUPPath added to $WindowsPartition" WriteLog "$CUPPath added to $WindowsPartition"
} }
if ($UpdateLatestNet) { if ($UpdateLatestNet) {
WriteLog "Adding $NETPath to $WindowsPartition" WriteLog "Adding $NETPath to $WindowsPartition"
Add-WindowsPackage -Path $WindowsPartition -PackagePath $NETPath | Out-Null # Add-WindowsPackage -Path $WindowsPartition -PackagePath $NETPath | Out-Null
Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$NETPath" | Out-Null
WriteLog "$NETPath added to $WindowsPartition" WriteLog "$NETPath added to $WindowsPartition"
} }
if ($UpdateLatestMicrocode -and $WindowsRelease -in 2016, 2019) { if ($UpdateLatestMicrocode -and $WindowsRelease -in 2016, 2019) {
WriteLog "Adding $MicrocodePath to $WindowsPartition" WriteLog "Adding $MicrocodePath to $WindowsPartition"
Add-WindowsPackage -Path $WindowsPartition -PackagePath $MicrocodePath | Out-Null # Add-WindowsPackage -Path $WindowsPartition -PackagePath $MicrocodePath | Out-Null
Invoke-Process cmd "/c ""$DandIEnv"" && dism /Image:$WindowsPartition /Add-Package /PackagePath:$MicrocodePath" | Out-Null
WriteLog "$MicrocodePath added to $WindowsPartition" WriteLog "$MicrocodePath added to $WindowsPartition"
} }
WriteLog "KBs added to $WindowsPartition" WriteLog "KBs added to $WindowsPartition"