disk: calculate padding for secondary GPT header

Instead of hard coding a padding of 100 sectors for all layouts, i.e.
MBR and GTP, adjust the needed space depending on the layout: for MBR 
we don't need to reserve any space at all since it does not have a 
secondary header. For GTP we reserve 33 sectors, as indicated in the
UEFI specific, which allows for the header itself and up to 128 entries.
To not modify the layout of already released distributions, like RHEL
8.4 and 8.5, a new member called `ExtraPadding` is added to `Partition
Table` and then used in the corresponding layouts to preserve the
existing padding of 100.
This commit is contained in:
Christian Kellner 2022-02-18 16:45:24 +01:00 committed by Tom Gundersen
parent b3c769ae02
commit b7abef54e8
65 changed files with 269 additions and 225 deletions

View file

@ -27,7 +27,8 @@ type PartitionTable struct {
Type string // Partition table type, e.g. dos, gpt.
Partitions []Partition
SectorSize uint64 // Sector size in bytes
SectorSize uint64 // Sector size in bytes
ExtraPadding uint64 // Extra space at the end of the partition table (sectors)
}
type Partition struct {
@ -92,7 +93,8 @@ func (pt *PartitionTable) Clone() *PartitionTable {
Type: pt.Type,
Partitions: partitions,
SectorSize: pt.SectorSize,
SectorSize: pt.SectorSize,
ExtraPadding: pt.ExtraPadding,
}
}
@ -333,10 +335,18 @@ func (pt *PartitionTable) updatePartitionStartPointOffsets(start, size uint64) u
root := &pt.Partitions[rootIdx]
root.Start = start
// Calculate the room at the end of the partition table that
// we might need to leave empty
padding := pt.ExtraPadding
if pt.Type == "gpt" {
padding += 33 // 33 sectors for the secondary GPT header
}
// If the sum of all partitions is bigger then the specified size,
// we use that instead. Grow the partition table size if needed.
if sum := pt.SectorsToBytes(root.Start + root.Size); sum > size {
size = sum
end := root.Start + padding + root.Size
if endBytes := pt.SectorsToBytes(end); endBytes > size {
size = endBytes
}
if size > pt.Size {
@ -348,7 +358,7 @@ func (pt *PartitionTable) updatePartitionStartPointOffsets(start, size uint64) u
// Finally we shrink the last partition, i.e. the root partition,
// to leave space for the secondary GPT header.
root.Size -= 100
root.Size -= padding
return start
}

View file

@ -5,10 +5,21 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro"
)
const (
// For historical reasons the 8.5/9.0 beta images had some
// extra padding at the end. The reason was to leave space
// for the secondary GPT header, but it was too much and
// also done for MBR. Since image definitions are frozen,
// we keep this extra padding around.
ExtraPaddingGPT = uint64(67)
ExtraPaddingMBR = uint64(100)
)
var defaultBasePartitionTables = distro.BasePartitionTableMap{
distro.X86_64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 2048,
@ -44,8 +55,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Aarch64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 204800,
@ -75,8 +87,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Ppc64leArchName: disk.PartitionTable{
UUID: "0x14fc63d2",
Type: "dos",
UUID: "0x14fc63d2",
Type: "dos",
ExtraPadding: ExtraPaddingMBR,
Partitions: []disk.Partition{
{
Size: 8192,
@ -95,8 +108,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.S390xArchName: disk.PartitionTable{
UUID: "0x14fc63d2",
Type: "dos",
UUID: "0x14fc63d2",
Type: "dos",
ExtraPadding: ExtraPaddingMBR,
Partitions: []disk.Partition{
{
Bootable: true,
@ -114,8 +128,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
var ec2BasePartitionTables = distro.BasePartitionTableMap{
distro.X86_64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 2048,
@ -138,8 +153,9 @@ var ec2BasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Aarch64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 409600,
@ -184,8 +200,9 @@ var ec2BasePartitionTables = distro.BasePartitionTableMap{
var edgeBasePartitionTables = distro.BasePartitionTableMap{
distro.X86_64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 2048, // 2MB
@ -235,8 +252,9 @@ var edgeBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Aarch64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 260096, // 127 MB

View file

@ -5,10 +5,21 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro"
)
const (
// For historical reasons the 8.5/9.0 beta images had some
// extra padding at the end. The reason was to leave space
// for the secondary GPT header, but it was too much and
// also done for MBR. Since image definitions are frozen,
// we keep this extra padding around.
ExtraPaddingGPT = uint64(67)
ExtraPaddingMBR = uint64(100)
)
var defaultBasePartitionTables = distro.BasePartitionTableMap{
distro.X86_64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 2048,
@ -44,8 +55,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Aarch64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 204800,
@ -75,8 +87,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Ppc64leArchName: disk.PartitionTable{
UUID: "0x14fc63d2",
Type: "dos",
UUID: "0x14fc63d2",
Type: "dos",
ExtraPadding: ExtraPaddingMBR,
Partitions: []disk.Partition{
{
Size: 8192,
@ -95,8 +108,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.S390xArchName: disk.PartitionTable{
UUID: "0x14fc63d2",
Type: "dos",
UUID: "0x14fc63d2",
Type: "dos",
ExtraPadding: ExtraPaddingMBR,
Partitions: []disk.Partition{
{
Bootable: true,
@ -114,8 +128,9 @@ var defaultBasePartitionTables = distro.BasePartitionTableMap{
var ec2BasePartitionTables = distro.BasePartitionTableMap{
distro.X86_64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 2048,
@ -138,8 +153,9 @@ var ec2BasePartitionTables = distro.BasePartitionTableMap{
},
},
distro.Aarch64ArchName: disk.PartitionTable{
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
UUID: "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
Type: "gpt",
ExtraPadding: ExtraPaddingGPT,
Partitions: []disk.Partition{
{
Size: 409600,

View file

@ -1115,7 +1115,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19511196,
"size": 19511263,
"start": 1460224,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1175,7 +1175,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
}
@ -1221,7 +1221,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
},

View file

@ -1027,7 +1027,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8181660,
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1071,7 +1071,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 8181660
"size": 8181727
}
}
}
@ -1109,7 +1109,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 8181660
"size": 8181727
}
}
},

View file

@ -1026,7 +1026,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20764572,
"size": 20764639,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1070,7 +1070,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
}
@ -1108,7 +1108,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
},

View file

@ -1325,7 +1325,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20764572,
"size": 20764639,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1369,7 +1369,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
}
@ -1407,7 +1407,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
},

View file

@ -1069,7 +1069,7 @@
"type": "41"
},
{
"size": 20961180,
"size": 20961280,
"start": 10240
}
]
@ -1094,7 +1094,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
}
@ -1124,7 +1124,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
},

View file

@ -1418,7 +1418,7 @@
"type": "41"
},
{
"size": 20961180,
"size": 20961280,
"start": 10240
}
]
@ -1443,7 +1443,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
}
@ -1473,7 +1473,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
},

View file

@ -1078,7 +1078,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1106,7 +1106,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
}
@ -1136,7 +1136,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

View file

@ -1048,7 +1048,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1092,7 +1092,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
}
@ -1130,7 +1130,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

View file

@ -1045,7 +1045,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20762524,
"size": 20762591,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1089,7 +1089,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
}
@ -1127,7 +1127,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
},

View file

@ -1346,7 +1346,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20762524,
"size": 20762591,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1390,7 +1390,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
}
@ -1428,7 +1428,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
},

View file

@ -1059,7 +1059,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1103,7 +1103,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
}
@ -1141,7 +1141,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

View file

@ -1017,7 +1017,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1061,7 +1061,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
}
@ -1099,7 +1099,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

View file

@ -1028,7 +1028,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1089,7 +1089,7 @@
"options": {
"filename": "image.raw",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1135,7 +1135,7 @@
"options": {
"filename": "image.raw",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -935,7 +935,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6952860,
"size": 6952927,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -996,7 +996,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 6952860
"size": 6952927
}
}
}
@ -1042,7 +1042,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 6952860
"size": 6952927
}
}
},

View file

@ -943,7 +943,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1004,7 +1004,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1050,7 +1050,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -1254,7 +1254,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1315,7 +1315,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1361,7 +1361,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -993,7 +993,7 @@
"start": 10240
},
{
"size": 19937180,
"size": 19937280,
"start": 1034240
}
]
@ -1035,7 +1035,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
}
@ -1073,7 +1073,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
},

View file

@ -1311,7 +1311,7 @@
"start": 10240
},
{
"size": 19937180,
"size": 19937280,
"start": 1034240
}
]
@ -1353,7 +1353,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
}
@ -1391,7 +1391,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
},

View file

@ -1068,7 +1068,7 @@
},
{
"bootable": true,
"size": 19945372,
"size": 19945472,
"start": 1026048
}
]
@ -1110,7 +1110,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
}
@ -1154,7 +1154,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},
@ -1199,7 +1199,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},

View file

@ -1369,7 +1369,7 @@
},
{
"bootable": true,
"size": 19945372,
"size": 19945472,
"start": 1026048
}
]
@ -1411,7 +1411,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
}
@ -1455,7 +1455,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},
@ -1500,7 +1500,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},

View file

@ -1031,7 +1031,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1092,7 +1092,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1138,7 +1138,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -982,7 +982,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6950812,
"size": 6950879,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1043,7 +1043,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
}
@ -1089,7 +1089,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
},

View file

@ -977,7 +977,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1038,7 +1038,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1084,7 +1084,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -1303,7 +1303,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1364,7 +1364,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1410,7 +1410,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -981,7 +981,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6950812,
"size": 6950879,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1042,7 +1042,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
}
@ -1088,7 +1088,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
},

View file

@ -948,7 +948,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6950812,
"size": 6950879,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1009,7 +1009,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
}
@ -1055,7 +1055,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
},

View file

@ -1144,7 +1144,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19511196,
"size": 19511263,
"start": 1460224,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1204,7 +1204,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
}
@ -1250,7 +1250,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
},

View file

@ -1158,7 +1158,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19511196,
"size": 19511263,
"start": 1460224,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1218,7 +1218,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
}
@ -1264,7 +1264,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
},

View file

@ -1049,7 +1049,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8181660,
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1093,7 +1093,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 8181660
"size": 8181727
}
}
}
@ -1131,7 +1131,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 8181660
"size": 8181727
}
}
},

View file

@ -1058,7 +1058,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20764572,
"size": 20764639,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1102,7 +1102,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
}
@ -1140,7 +1140,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
},

View file

@ -1378,7 +1378,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20764572,
"size": 20764639,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1422,7 +1422,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
}
@ -1460,7 +1460,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
},

View file

@ -1101,7 +1101,7 @@
"type": "41"
},
{
"size": 20961180,
"size": 20961280,
"start": 10240
}
]
@ -1126,7 +1126,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
}
@ -1156,7 +1156,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
},

View file

@ -1472,7 +1472,7 @@
"type": "41"
},
{
"size": 20961180,
"size": 20961280,
"start": 10240
}
]
@ -1497,7 +1497,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
}
@ -1527,7 +1527,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
},

View file

@ -1168,7 +1168,7 @@
"partitions": [
{
"bootable": true,
"size": 20969372,
"size": 20969472,
"start": 2048
}
]
@ -1193,7 +1193,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
}
@ -1229,7 +1229,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
},
@ -1260,7 +1260,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
},

View file

@ -1479,7 +1479,7 @@
"partitions": [
{
"bootable": true,
"size": 20969372,
"size": 20969472,
"start": 2048
}
]
@ -1504,7 +1504,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
}
@ -1540,7 +1540,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
},
@ -1571,7 +1571,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
},

View file

@ -1112,7 +1112,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1140,7 +1140,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
}
@ -1170,7 +1170,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

View file

@ -1128,7 +1128,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1156,7 +1156,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
}
@ -1186,7 +1186,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

View file

@ -1313,7 +1313,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1341,7 +1341,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
}
@ -1371,7 +1371,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

View file

@ -1508,7 +1508,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1536,7 +1536,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
}
@ -1566,7 +1566,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

View file

@ -1072,7 +1072,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1116,7 +1116,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
}
@ -1154,7 +1154,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

View file

@ -1078,7 +1078,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20762524,
"size": 20762591,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1122,7 +1122,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
}
@ -1160,7 +1160,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
},

View file

@ -1402,7 +1402,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20762524,
"size": 20762591,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1446,7 +1446,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
}
@ -1484,7 +1484,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
},

View file

@ -1075,7 +1075,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1119,7 +1119,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
}
@ -1157,7 +1157,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

View file

@ -1038,7 +1038,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1082,7 +1082,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
}
@ -1120,7 +1120,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

View file

@ -1051,7 +1051,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1112,7 +1112,7 @@
"options": {
"filename": "image.raw",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1158,7 +1158,7 @@
"options": {
"filename": "image.raw",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -1066,7 +1066,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1127,7 +1127,7 @@
"options": {
"filename": "image.raw",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1173,7 +1173,7 @@
"options": {
"filename": "image.raw",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -945,7 +945,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6952860,
"size": 6952927,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1006,7 +1006,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 6952860
"size": 6952927
}
}
}
@ -1052,7 +1052,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 6952860
"size": 6952927
}
}
},

View file

@ -971,7 +971,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1032,7 +1032,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1078,7 +1078,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -1304,7 +1304,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19535772,
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1365,7 +1365,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
}
@ -1411,7 +1411,7 @@
"options": {
"filename": "disk.img",
"start": 1435648,
"size": 19535772
"size": 19535839
}
}
},

View file

@ -1023,7 +1023,7 @@
"start": 10240
},
{
"size": 19937180,
"size": 19937280,
"start": 1034240
}
]
@ -1065,7 +1065,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
}
@ -1103,7 +1103,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
},

View file

@ -1364,7 +1364,7 @@
"start": 10240
},
{
"size": 19937180,
"size": 19937280,
"start": 1034240
}
]
@ -1406,7 +1406,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
}
@ -1444,7 +1444,7 @@
"options": {
"filename": "disk.img",
"start": 1034240,
"size": 19937180
"size": 19937280
}
}
},

View file

@ -1097,7 +1097,7 @@
},
{
"bootable": true,
"size": 19945372,
"size": 19945472,
"start": 1026048
}
]
@ -1139,7 +1139,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
}
@ -1183,7 +1183,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},
@ -1228,7 +1228,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},

View file

@ -1420,7 +1420,7 @@
},
{
"bootable": true,
"size": 19945372,
"size": 19945472,
"start": 1026048
}
]
@ -1462,7 +1462,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
}
@ -1506,7 +1506,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},
@ -1551,7 +1551,7 @@
"options": {
"filename": "disk.img",
"start": 1026048,
"size": 19945372
"size": 19945472
}
}
},

View file

@ -1049,7 +1049,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1110,7 +1110,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1156,7 +1156,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -1066,7 +1066,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1127,7 +1127,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1173,7 +1173,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -1264,7 +1264,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1325,7 +1325,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1371,7 +1371,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -1489,7 +1489,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1550,7 +1550,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1596,7 +1596,7 @@
"options": {
"filename": "image.raw",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -986,7 +986,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6950812,
"size": 6950879,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1047,7 +1047,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
}
@ -1093,7 +1093,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
},

View file

@ -998,7 +998,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1059,7 +1059,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1105,7 +1105,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -1348,7 +1348,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19533724,
"size": 19533791,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1409,7 +1409,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
}
@ -1455,7 +1455,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 19533724
"size": 19533791
}
}
},

View file

@ -985,7 +985,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6950812,
"size": 6950879,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1046,7 +1046,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
}
@ -1092,7 +1092,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
},

View file

@ -958,7 +958,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 6950812,
"size": 6950879,
"start": 1437696,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -1019,7 +1019,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
}
@ -1065,7 +1065,7 @@
"options": {
"filename": "disk.img",
"start": 1437696,
"size": 6950812
"size": 6950879
}
}
},