Merge pull request openshift#1479 from jbtrystram/zram-no-defaults

COS-2507: Manifests: disable default ZRAM config
jlebon · Apr 11, 2024 · 15bd01d · 15bd01d
2 parents 94146f6 + 8e419e2
commit 15bd01d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git 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
diff --git a/zram-no-defaults.yaml 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"