particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support user-defined partition numbers for GPT disks

Browse source 
Partitions by default are indexed starting at 1, but in
some cases, such as CoreOS for IBM Z, it may be usefull
to set the 'partnum' for GPT disks explicitly, without
creating dummy partitions.

Now user can define an image:

```
    mpp-define-images:
      - id: image
        size: 10737418240
        table:
          uuid: 00000000-0000-4000-a000-000000000001
          label: gpt
          partitions:
            - name: boot
              type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
	      partnum: 3
              size: 786432
            - name: root
              type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
	      partnum: 4
              size: 4194304
```

So target disk would look like:

```
    Disklabel type: gpt
    Disk identifier: 00000000-0000-4000-A000-000000000001
    Device        Start     End Sectors  Size Type
    /dev/loop0p3   2048  788479  786432  384M Linux filesystem
    /dev/loop0p4 788480 4982783 4194304    2G Linux filesystem
```

This patch updates the osbuild-mpp tool and the sgdisk and sfdisk
stages to support this.

Co-authored-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
Nikita Dubrovskii 2024-01-26 14:18:21 +01:00 • committed by Achilleas Koutsou
parent 6b8c1872f6
commit fc185dae8c
7 changed files with 57 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tools/osbuild-mpp
View file

@ -357,6 +357,7 @@ import hashlib
import json
import os
import pathlib
import re
import string
import subprocess
import sys
@ -815,6 +816,7 @@ class Partition:
def __init__(self,
uid: str = None,
pttype: str = None,
partnum: int = None,
start: int = None,
size: int = None,
bootable: bool = False,
@ -830,8 +832,8 @@ class Partition:
self.name = name
self.uuid = uuid
self.attrs = attrs
self.index = None
self.partnum = None
self.index = partnum - 1 if partnum else None
self.partnum = partnum if partnum else None
@property
def start_in_bytes(self):
@ -845,6 +847,7 @@ class Partition:
def from_dict(cls, js):
p = cls(uid=js.get("id"),
pttype=js.get("type"),
partnum=js.get("partnum"),
start=js.get("start"),
size=js.get("size"),
bootable=js.get("bootable"),
@ -858,6 +861,8 @@ class Partition:
if self.start:
data["start"] = self.start
if self.partnum:
data["partnum"] = self.partnum
if self.size:
data["size"] = self.size
if self.type:
@ -915,7 +920,10 @@ class PartitionTable:
fields += [f'{field}="{value}"']
if partition.bootable:
fields += ["bootable"]
command += "\n" + ", ".join(fields)
if partition.partnum:
command += "\n" + f'{target}p{partition.partnum}: ' + ", ".join(fields)
else:
command += "\n" + ", ".join(fields)
subprocess.run(["sfdisk", "-q", "--no-tell-kernel", target],
input=command,
@ -936,8 +944,8 @@ class PartitionTable:
assert len(disk_parts) == len(self.partitions)
for i, part in enumerate(self.partitions):
part.index = i
part.partnum = i + 1
part.partnum = int(re.findall(r'\d+$', disk_parts[i]["node"])[0])
part.index = part.partnum - 1
part.start = disk_parts[i]["start"]
part.size = disk_parts[i]["size"]
part.type = disk_parts[i].get("type")