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

Merge branch '2405.1' into feature-reduce-ffu-size

Browse Source
This commit is contained in:
rbalsleyMSFT
2024-05-24 15:19:31 -07:00
committed by GitHub
parent 49a9fd49c1 fc8648eb65
commit a3faa89ada
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/Apps/InstallAppsandSysprep.cmd
-3
View File
@@ -15,9 +15,6 @@ del c:\windows\panther\unattend\unattend.xml /F /Q
del c:\windows\panther\unattend.xml /F /Q del c:\windows\panther\unattend.xml /F /Q
taskkill /IM sysprep.exe taskkill /IM sysprep.exe
timeout /t 10 timeout /t 10
REM Run Component Cleanup since dism /online /cleanup-image /analyzecomponentcleanup recommends it
REM If adding latest CU, definitely need to do this to keep FFU size smaller
dism /online /cleanup-image /startcomponentcleanup /resetbase
REM Run disk cleanup (cleanmgr.exe) with all options enabled: https://learn.microsoft.com/en-us/troubleshoot/windows-server/backup-and-storage/automating-disk-cleanup-tool REM Run disk cleanup (cleanmgr.exe) with all options enabled: https://learn.microsoft.com/en-us/troubleshoot/windows-server/backup-and-storage/automating-disk-cleanup-tool
set rootkey=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches set rootkey=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\VolumeCaches
REM Per above doc, the Offline Pages Files subkey does not have stateflags value REM Per above doc, the Offline Pages Files subkey does not have stateflags value
FFUDevelopment/BuildFFUVM.ps1
+5 -2
View File
@@ -2265,10 +2265,13 @@ try {
if ($UpdateLatestCU -or $UpdateLatestNet) { if ($UpdateLatestCU -or $UpdateLatestNet) {
try { try {
WriteLog "Adding KBs to $WindowsPartition" WriteLog "Adding KBs to $WindowsPartition"
Add-WindowsPackage -Path $WindowsPartition -PackagePath $KBPath | Out-Null Add-WindowsPackage -Path $WindowsPartition -PackagePath $KBPath -PreventPending | Out-Null
WriteLog "KBs added to $WindowsPartition" WriteLog "KBs added to $WindowsPartition"
WriteLog "Removing $KBPath" WriteLog "Removing $KBPath"
Remove-Item -Path $KBPath -Recurse -Force | Out-Null Remove-Item -Path $KBPath -Recurse -Force | Out-Null
WriteLog "Clean Up the WinSxS Folder"
Dism /Image:$WindowsPartition /Cleanup-Image /StartComponentCleanup /ResetBase | Out-Null
WriteLog "Clean Up the WinSxS Folder completed"
} }
catch { catch {
Write-Host "Adding KB to VHDX failed with error $_" Write-Host "Adding KB to VHDX failed with error $_"
@@ -2524,4 +2527,4 @@ If ($CleanupAppsISO) {
#Clean up dirty.txt file #Clean up dirty.txt file
Remove-Item -Path .\dirty.txt -Force | out-null Remove-Item -Path .\dirty.txt -Force | out-null
Write-Host "Script complete" Write-Host "Script complete"
WriteLog "Script complete" WriteLog "Script complete"