blueprint: move ext4-filesystem towards lorax parity
The main difference (according to image-info) is an additional package containing a gpg key which was used to verify packages. The one generated by lorax-composer doesn't have this, because it doesn't verify signatures.
This commit is contained in:
parent
e8bd3cba45
commit
fe46fd3a89
3 changed files with 40 additions and 156 deletions
|
|
@ -124,7 +124,7 @@ func TestFilenameFromType(t *testing.T) {
|
|||
{
|
||||
name: "ext4",
|
||||
args: args{"ext4-filesystem"},
|
||||
want: "image.img",
|
||||
want: "filesystem.img",
|
||||
want1: "application/octet-stream",
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,14 +5,28 @@ import "github.com/osbuild/osbuild-composer/internal/pipeline"
|
|||
type ext4Output struct{}
|
||||
|
||||
func (t *ext4Output) translate(b *Blueprint) *pipeline.Pipeline {
|
||||
p := getF30Pipeline()
|
||||
packages := [...]string{
|
||||
"policycoreutils",
|
||||
"selinux-policy-targeted",
|
||||
"kernel",
|
||||
"firewalld",
|
||||
"chrony",
|
||||
"langpacks-en",
|
||||
}
|
||||
excludedPackages := [...]string{
|
||||
"dracut-config-rescue",
|
||||
}
|
||||
p := getCustomF30PackageSet(packages[:], excludedPackages[:])
|
||||
addF30LocaleStage(p)
|
||||
addF30GRUB2Stage(p, b.getKernelCustomization())
|
||||
addF30FixBlsStage(p)
|
||||
addF30SELinuxStage(p)
|
||||
addF30RawFSAssembler(p, t.getName())
|
||||
return p
|
||||
}
|
||||
|
||||
func (t *ext4Output) getName() string {
|
||||
return "image.img"
|
||||
return "filesystem.img"
|
||||
}
|
||||
|
||||
func (t *ext4Output) getMime() string {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue