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

blueprint: always run selinux stage last

Browse source 
A few output types had it before the fix-bls stage.
This commit is contained in:
Lars Karlitski 2019-10-29 12:32:55 +01:00 • committed by Tom Gundersen
parent 6a6144c2d9
commit fabd40da1c
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/blueprint/openstack_output.go
View file

@ -25,8 +25,8 @@ func (t *openstackOutput) translate(b *Blueprint) *pipeline.Pipeline {
addF30LocaleStage(p) addF30LocaleStage(p)
addF30FSTabStage(p) addF30FSTabStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization()) addF30GRUB2Stage(p, b.getKernelCustomization())
addF30SELinuxStage(p)
addF30FixBlsStage(p) addF30FixBlsStage(p)
addF30SELinuxStage(p)
addF30QemuAssembler(p, "qcow2", t.getName()) addF30QemuAssembler(p, "qcow2", t.getName())
return p return p
} }

2
internal/blueprint/qcow2_output.go
View file

@ -26,8 +26,8 @@ func (t *qcow2Output) translate(b *Blueprint) *pipeline.Pipeline {
addF30LocaleStage(p) addF30LocaleStage(p)
addF30FSTabStage(p) addF30FSTabStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization()) addF30GRUB2Stage(p, b.getKernelCustomization())
addF30SELinuxStage(p)
addF30FixBlsStage(p) addF30FixBlsStage(p)
addF30SELinuxStage(p)
addF30QemuAssembler(p, "qcow2", t.getName()) addF30QemuAssembler(p, "qcow2", t.getName())
return p return p

2
internal/blueprint/vhd_output.go
View file

@ -24,8 +24,8 @@ func (t *vhdOutput) translate(b *Blueprint) *pipeline.Pipeline {
addF30LocaleStage(p) addF30LocaleStage(p)
addF30FSTabStage(p) addF30FSTabStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization()) addF30GRUB2Stage(p, b.getKernelCustomization())
addF30SELinuxStage(p)
addF30FixBlsStage(p) addF30FixBlsStage(p)
addF30SELinuxStage(p)
addF30QemuAssembler(p, "qcow2", t.getName()) addF30QemuAssembler(p, "qcow2", t.getName())
return p return p
} }

8
tools/test_image_info/pipelines/openstack_empty_blueprint.json
View file

@ -91,15 +91,15 @@
"kernel_opts": "ro biosdevname=0 net.ifnames=0" "kernel_opts": "ro biosdevname=0 net.ifnames=0"
} }
}, },
{
"name": "org.osbuild.fix-bls",
"options": {}
},
{ {
"name": "org.osbuild.selinux", "name": "org.osbuild.selinux",
"options": { "options": {
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts" "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
} }
},
{
"name": "org.osbuild.fix-bls",
"options": {}
} }
], ],
"assembler": { "assembler": {

8
tools/test_image_info/pipelines/qcow2_empty_blueprint.json
View file

@ -92,15 +92,15 @@
"kernel_opts": "ro biosdevname=0 net.ifnames=0" "kernel_opts": "ro biosdevname=0 net.ifnames=0"
} }
}, },
{
"name": "org.osbuild.fix-bls",
"options": {}
},
{ {
"name": "org.osbuild.selinux", "name": "org.osbuild.selinux",
"options": { "options": {
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts" "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
} }
},
{
"name": "org.osbuild.fix-bls",
"options": {}
} }
], ],
"assembler": { "assembler": {

8
tools/test_image_info/pipelines/vhd_empty_blueprint.json
View file

@ -90,15 +90,15 @@
"kernel_opts": "ro biosdevname=0 net.ifnames=0" "kernel_opts": "ro biosdevname=0 net.ifnames=0"
} }
}, },
{
"name": "org.osbuild.fix-bls",
"options": {}
},
{ {
"name": "org.osbuild.selinux", "name": "org.osbuild.selinux",
"options": { "options": {
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts" "file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
} }
},
{
"name": "org.osbuild.fix-bls",
"options": {}
} }
], ],
"assembler": { "assembler": {