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

blueprint: always exclude the rescue kernel

Browse source 
Its BLS entry always expects a separate boot partition. Skip it on all
images until the rescue kernel package is usable.
This commit is contained in:
Lars Karlitski 2019-10-29 12:11:11 +01:00 • committed by Tom Gundersen
parent 930347c56e
commit 6a6144c2d9
6 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/blueprint/ami_output.go
View file

@ -18,7 +18,10 @@ func (t *amiOutput) translate(b *Blueprint) *pipeline.Pipeline {
"checkpolicy", "checkpolicy",
"net-tools", "net-tools",
} }
p := getCustomF30PackageSet(packages[:], []string{}) excludedPackages := [...]string{
"dracut-config-rescue",
}
p := getCustomF30PackageSet(packages[:], excludedPackages[:])
addF30FixBlsStage(p) addF30FixBlsStage(p)
addF30LocaleStage(p) addF30LocaleStage(p)
addF30FSTabStage(p) addF30FSTabStage(p)

5
internal/blueprint/openstack_output.go
View file

@ -18,7 +18,10 @@ func (t *openstackOutput) translate(b *Blueprint) *pipeline.Pipeline {
"cloud-init", "cloud-init",
"libdrm", "libdrm",
} }
p := getCustomF30PackageSet(packages[:], []string{}) excludedPackages := [...]string{
"dracut-config-rescue",
}
p := getCustomF30PackageSet(packages[:], excludedPackages[:])
addF30LocaleStage(p) addF30LocaleStage(p)
addF30FSTabStage(p) addF30FSTabStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization()) addF30GRUB2Stage(p, b.getKernelCustomization())

5
internal/blueprint/vhd_output.go
View file

@ -17,7 +17,10 @@ func (t *vhdOutput) translate(b *Blueprint) *pipeline.Pipeline {
"WALinuxAgent", "WALinuxAgent",
"libxcrypt-compat", "libxcrypt-compat",
} }
p := getCustomF30PackageSet(packages[:], []string{}) excludedPackages := [...]string{
"dracut-config-rescue",
}
p := getCustomF30PackageSet(packages[:], excludedPackages[:])
addF30LocaleStage(p) addF30LocaleStage(p)
addF30FSTabStage(p) addF30FSTabStage(p)
addF30GRUB2Stage(p, b.getKernelCustomization()) addF30GRUB2Stage(p, b.getKernelCustomization())

3
tools/test_image_info/pipelines/ami_empty_blueprint.json
View file

@ -55,6 +55,9 @@
"checkpolicy", "checkpolicy",
"net-tools" "net-tools"
], ],
"exclude_packages": [
"dracut-config-rescue"
],
"releasever": "30", "releasever": "30",
"basearch": "x86_64" "basearch": "x86_64"
} }

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

@ -55,6 +55,9 @@
"cloud-init", "cloud-init",
"libdrm" "libdrm"
], ],
"exclude_packages": [
"dracut-config-rescue"
],
"releasever": "30", "releasever": "30",
"basearch": "x86_64" "basearch": "x86_64"
} }

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

@ -54,6 +54,9 @@
"WALinuxAgent", "WALinuxAgent",
"libxcrypt-compat" "libxcrypt-compat"
], ],
"exclude_packages": [
"dracut-config-rescue"
],
"releasever": "30", "releasever": "30",
"basearch": "x86_64" "basearch": "x86_64"
} }