ewilliams28/FFU
1
0
Fork 0
mirror of https://github.com/rbalsleyMSFT/FFU.git synced 2026-08-12 21:53:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolve remapped Fill Remaining FFU optimize targets

Browse Source 
Fall back to the Fill Remaining data partition's volume label or name when the mounted VHDX no longer uses the configured build-time drive letter. Log the resolved drive letter and preserve manual OptimizeFFUPartitionNumber overrides.
This commit is contained in:
rbalsleyMSFT
2026-06-23 21:31:40 -07:00
parent db952355f3
commit 51b490bca3
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FFUDevelopment/BuildFFUVM.ps1
+28 -3
View File
@@ -3493,12 +3493,37 @@ function Get-FFUOptimizePartitionNumber {
throw "FillRemaining data partition '$($fillRemainingDataPartition.Name)' does not have a drive letter for FFU optimization."
}
$dataPartition = $Disk | Get-Partition | Where-Object { ([string]$_.DriveLetter).Trim().TrimEnd(':').ToUpperInvariant() -eq $driveLetter } | Select-Object -First 1
$basicDataPartitions = @($Disk | Get-Partition | Where-Object { $_.GptType -eq '{ebd0a0a2-b9e5-4433-87c0-68b6b72699c7}' })
$dataPartition = $basicDataPartitions | Where-Object { ([string]$_.DriveLetter).Trim().TrimEnd(':').ToUpperInvariant() -eq $driveLetter } | Select-Object -First 1
if ($null -eq $dataPartition) {
throw "Unable to resolve FillRemaining data partition '$($fillRemainingDataPartition.Name)' at drive ${driveLetter}: for FFU optimization."
$expectedLabels = [System.Collections.Generic.List[string]]::new()
foreach ($labelValue in @($fillRemainingDataPartition.Label, $fillRemainingDataPartition.Name)) {
$label = ([string]$labelValue).Trim()
if (-not [string]::IsNullOrWhiteSpace($label) -and -not $expectedLabels.Contains($label)) {
$expectedLabels.Add($label)
}
}
foreach ($partition in $basicDataPartitions) {
if ([string]::IsNullOrWhiteSpace([string]$partition.DriveLetter)) { continue }
$volume = Get-Volume -DriveLetter $partition.DriveLetter -ErrorAction SilentlyContinue
if ($null -eq $volume) { continue }
if ($expectedLabels -contains ([string]$volume.FileSystemLabel)) {
$dataPartition = $partition
break
}
}
}
if ($null -eq $dataPartition) {
$expectedLabelText = $expectedLabels -join "' or '"
$expectedLabelMessage = if ($expectedLabels.Count -gt 0) { " or label '$expectedLabelText'" } else { '' }
throw "Unable to resolve FillRemaining data partition '$($fillRemainingDataPartition.Name)' at drive ${driveLetter}:$expectedLabelMessage for FFU optimization."
}
WriteLog "Using FillRemaining data partition '$($fillRemainingDataPartition.Name)' (partition number $($dataPartition.PartitionNumber)) for FFU optimization."
$resolvedDriveLetter = ([string]$dataPartition.DriveLetter).Trim().TrimEnd(':').ToUpperInvariant()
$resolvedDriveLetterLog = if ([string]::IsNullOrWhiteSpace($resolvedDriveLetter)) { '' } else { ", drive ${resolvedDriveLetter}:" }
WriteLog "Using FillRemaining data partition '$($fillRemainingDataPartition.Name)' (partition number $($dataPartition.PartitionNumber)$resolvedDriveLetterLog) for FFU optimization."
return [int]$dataPartition.PartitionNumber
}