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

distro/rhel: move dracut-config-generic to bootloader packages

Browse source 
This change makes the dracut-config-generic installation in par with
Fedora. Also, by having it in bootloader packages, it is not installed in
non-bootable images, where it provides no value.
This commit is contained in:
Ondřej Budai 2020-04-01 11:05:39 +02:00
parent f14224ede1
commit c48728a049
2 changed files with 2 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/distro/rhel81/distro.go
View file

@ -181,6 +181,7 @@ func New() *RHEL81 {
"x86_64": arch{
name: "x86_64",
bootloaderPackages: []string{
"dracut-config-generic",
"grub2-pc",
},
buildPackages: []string{
@ -212,7 +213,6 @@ func New() *RHEL81 {
"cloud-utils-growpart",
"@core",
"dhcp-client",
"dracut-config-generic",
"gdisk",
"insights-client",
"kernel",
@ -287,7 +287,6 @@ func New() *RHEL81 {
"kernel",
"firewalld",
"chrony",
"dracut-config-generic",
"langpacks-en",
},
excludedPackages: []string{
@ -309,7 +308,6 @@ func New() *RHEL81 {
packages: []string{
"@core",
"chrony",
"dracut-config-generic",
"firewalld",
"kernel",
"langpacks-en",
@ -345,7 +343,6 @@ func New() *RHEL81 {
"python3-jsonschema",
"qemu-guest-agent",
"cloud-utils-growpart",
"dracut-config-generic",
"dracut-norescue",
"tar",
"tcpdump",
@ -422,10 +419,6 @@ func New() *RHEL81 {
"@Core",
"langpacks-en",
// Don't run dracut in host-only mode, in order to pull in
// the hv_vmbus, hv_netvsc and hv_storvsc modules into the initrd.
"dracut-config-generic",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
@ -453,7 +446,6 @@ func New() *RHEL81 {
"kernel",
"firewalld",
"chrony",
"dracut-config-generic",
"langpacks-en",
},
excludedPackages: []string{
@ -476,10 +468,6 @@ func New() *RHEL81 {
"@Core",
"langpacks-en",
// Don't run dracut in host-only mode, in order to pull in
// the hv_vmbus, hv_netvsc and hv_storvsc modules into the initrd.
"dracut-config-generic",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
@ -517,7 +505,6 @@ func New() *RHEL81 {
packages: []string{
"@core",
"chrony",
"dracut-config-generic",
"firewalld",
"kernel",
"langpacks-en",

15
internal/distro/rhel82/distro.go
View file

@ -181,6 +181,7 @@ func New() *RHEL82 {
"x86_64": arch{
name: "x86_64",
bootloaderPackages: []string{
"dracut-config-generic",
"grub2-pc",
},
buildPackages: []string{
@ -212,7 +213,6 @@ func New() *RHEL82 {
"cloud-utils-growpart",
"@core",
"dhcp-client",
"dracut-config-generic",
"gdisk",
"insights-client",
"kernel",
@ -287,7 +287,6 @@ func New() *RHEL82 {
"kernel",
"firewalld",
"chrony",
"dracut-config-generic",
"langpacks-en",
},
excludedPackages: []string{
@ -309,7 +308,6 @@ func New() *RHEL82 {
packages: []string{
"@core",
"chrony",
"dracut-config-generic",
"firewalld",
"kernel",
"langpacks-en",
@ -345,7 +343,6 @@ func New() *RHEL82 {
"python3-jsonschema",
"qemu-guest-agent",
"cloud-utils-growpart",
"dracut-config-generic",
"dracut-norescue",
"tar",
"tcpdump",
@ -422,10 +419,6 @@ func New() *RHEL82 {
"@Core",
"langpacks-en",
// Don't run dracut in host-only mode, in order to pull in
// the hv_vmbus, hv_netvsc and hv_storvsc modules into the initrd.
"dracut-config-generic",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
@ -453,7 +446,6 @@ func New() *RHEL82 {
"kernel",
"firewalld",
"chrony",
"dracut-config-generic",
"langpacks-en",
},
excludedPackages: []string{
@ -476,10 +468,6 @@ func New() *RHEL82 {
"@Core",
"langpacks-en",
// Don't run dracut in host-only mode, in order to pull in
// the hv_vmbus, hv_netvsc and hv_storvsc modules into the initrd.
"dracut-config-generic",
// From the lorax kickstart
"kernel",
"selinux-policy-targeted",
@ -517,7 +505,6 @@ func New() *RHEL82 {
packages: []string{
"@core",
"chrony",
"dracut-config-generic",
"firewalld",
"kernel",
"langpacks-en",