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

disk: create file system accessors and use those

Browse source 
In various places we are interested in the root and boot file-
systems. Currently those were accessed via by retrieving the
partition that contain them and the accessing the filesystem
member. Add accessors to `PartitionTable` that directly return
the needed filesystem. This will help if the file system is
stored inside a container like LVM or LUKS instead of directly
on a partition.
This commit is contained in:
Christian Kellner 2021-11-10 18:45:22 +01:00 • committed by Tom Gundersen
parent d589317dcb
commit c8efc7d282
10 changed files with 73 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/distro/rhel84/distro.go
View file

@ -392,13 +392,13 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
panic("s390x image must have a partition table, this is a programming error")
}
rootPartition := pt.RootPartition()
if rootPartition == nil {
panic("s390x image must have a root partition, this is a programming error")
rootFs := pt.RootFilesystem()
if rootFs == nil {
panic("s390x image must have a root filesystem, this is a programming error")
}
p.AddStage(osbuild.NewKernelCmdlineStage(&osbuild.KernelCmdlineStageOptions{
RootFsUUID: rootPartition.Filesystem.UUID,
RootFsUUID: rootFs.UUID,
KernelOpts: t.kernelOptions,
}))
}
@ -636,13 +636,13 @@ func (t *imageType) grub2StageOptions(pt *disk.PartitionTable, kernelOptions str
if pt == nil {
panic("partition table must be defined for grub2 stage, this is a programming error")
}
rootPartition := pt.RootPartition()
if rootPartition == nil {
panic("root partition must be defined for grub2 stage, this is a programming error")
rootFs := pt.RootFilesystem()
if rootFs == nil {
panic("root filesystem must be defined for grub2 stage, this is a programming error")
}
stageOptions := osbuild.GRUB2StageOptions{
RootFilesystemUUID: uuid.MustParse(rootPartition.Filesystem.UUID),
RootFilesystemUUID: uuid.MustParse(rootFs.UUID),
KernelOptions: kernelOptions,
Legacy: legacy,
}