Skip to content

Commit 99d4451

Browse files
committed
HACK/TMP: workaround for bogus raw disk support with no proper sector size detection
1 parent 3894eee commit 99d4451

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/MobilePackageGen.Adapters/Adapters/DiskCommon.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static List<IDisk> GetUpdateOSDisks(List<IDisk> disks)
102102
{
103103
List<(GPT.GPT.Partition, Stream)> partitions = [];
104104

105-
int sectorSize = virtualDisk.Geometry!.Value.BytesPerSector;
105+
int sectorSize = 4096;//virtualDisk.Geometry!.Value.BytesPerSector;
106106

107107
IEnumerable<GPT.GPT.Partition> partitionTable = GetGPTPartitions(virtualDisk.Content, (uint)sectorSize);
108108

@@ -189,8 +189,10 @@ private static SparseStream Open(GPT.GPT.Partition entry, uint SectorSize, Strea
189189

190190
return GPT.Partitions;
191191
}
192-
catch
192+
catch (Exception ex)
193193
{
194+
Console.WriteLine("EXCEPTION!");
195+
Console.WriteLine(ex);
194196
diskStream.Seek(0, SeekOrigin.Begin);
195197
return null;
196198
}

src/MobilePackageGen.Adapters/Adapters/RawDisk/Disk.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private static List<IPartition> GetPartitionStructures(IEnumerable<(GPT.GPT.Part
4141
private static (IEnumerable<(GPT.GPT.Partition, Stream)>, int, Stream) GetPartitions(Stream diskStream)
4242
{
4343
VirtualDisk virtualDisk = new DiscUtils.Raw.Disk(diskStream, Ownership.None);
44-
return (DiskCommon.GetPartitions(virtualDisk), virtualDisk.Geometry!.Value.BytesPerSector, virtualDisk.Content);
44+
return (DiskCommon.GetPartitions(virtualDisk), 4096/*virtualDisk.Geometry!.Value.BytesPerSector*/, virtualDisk.Content);
4545
}
4646
}
4747
}

0 commit comments

Comments
 (0)