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

assembler/qemu: helper to root fs partition

Browse source 
Introduce a method on the PartitionTable that returns the partition
containing the root filesystem. NB: this does not have to be the
first partition (which could be the EFI partition, or something
else), so we have to iterate through the partitions until we find
it.
This commit is contained in:
Christian Kellner 2019-12-16 16:50:57 +01:00 • committed by Tom Gundersen
parent 5ee68aef30
commit dc25fb3e42
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
assemblers/org.osbuild.qemu
View file

@ -236,6 +236,13 @@ class PartitionTable:
parts_fs = filter(lambda p: p.filesystem is not None, self.partitions)
return sorted(parts_fs, key=mountpoint_len)
def partition_containing_root(self) -> Partition:
"""Return the partition containing the root filesystem"""
for p in self.partitions:
if p.mountpoint and p.mountpoint == "/":
return p
return None
def write_to(self, target, sync=True):
"""Write the partition table to disk"""
# generate the command for sfdisk to create the table
@ -318,11 +325,8 @@ def install_grub2(image: str, pt: PartitionTable):
"""Install grub2 to image"""
grub2_core = "/var/tmp/grub2-core.img"
root_fs_type = "unknown"
for p in pt:
if p.mountpoint and p.mountpoint == "/":
root_fs_type = p.fs_type
break
root_part = pt.partition_containing_root()
root_fs_type = root_part.fs_type or "unknown"
if root_fs_type == "ext4":
fs_module = "ext2"