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

distro/rhel90: make selinux stage the last one

Browse source 
There are currently some context mismatches in the image because of the new
files from the sysconfig stage. Let's move the selinux stage to the end so
we fix them.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-06-29 08:44:45 +02:00 • committed by Ondřej Budai
parent 4c16b2f77e
commit 9bcd219528
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/distro/rhel90/distro.go
View file

@ -381,8 +381,6 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
p.AddStage(osbuild.NewZiplStage(&osbuild.ZiplStageOptions{}))
}
p.AddStage(osbuild.NewSELinuxStage(t.selinuxStageOptions()))
// These are the current defaults for the sysconfig stage. This can be changed to be image type exclusive if different configs are needed.
p.AddStage(osbuild.NewSysconfigStage(&osbuild.SysconfigStageOptions{
Kernel: osbuild.SysconfigKernelOptions{
@ -424,6 +422,9 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
}
}
// SELinux stage should be the last so everything has the right label.
p.AddStage(osbuild.NewSELinuxStage(t.selinuxStageOptions()))
p.Assembler = t.assembler(pt, options, t.arch)
return p, nil