diff --git a/common.yaml b/common.yaml index 0e42b663..682000c0 100644 --- a/common.yaml +++ b/common.yaml @@ -32,6 +32,13 @@ conditional-include: - if: basearch != "s390x" # And remove some cruft from grub2 include: fedora-coreos-config/manifests/grub2-removals.yaml + #zram default config is in a subpackage in c10s + # Meanwhile, remove the default config from the package + - if: osversion == "c9s" + include: zram-no-defaults.yaml + - if: osversion == "rhel-9.4" + include: zram-no-defaults.yaml + documentation: false diff --git a/fedora-coreos-config b/fedora-coreos-config index 9246e20b..a08194c7 160000 --- a/fedora-coreos-config +++ b/fedora-coreos-config @@ -1 +1 @@ -Subproject commit 9246e20b3dac3b148359292f8255566e2a057d0e +Subproject commit a08194c7a7f6cead70e7aacfdab651a9af578c40 diff --git a/zram-no-defaults.yaml b/zram-no-defaults.yaml new file mode 100644 index 00000000..ef9c1994 --- /dev/null +++ b/zram-no-defaults.yaml @@ -0,0 +1,5 @@ +remove-from-packages: + # zram-generator-0.3.2 (shipped in centOS 9) provides a default + # zram-generator config, we want to disable it + - - zram-generator + - "/usr/lib/systemd/zram-generator.conf" \ No newline at end of file