Merge pull request coreos#68 from HuijingHei/fcc-sync

NO-JIRA: Bump fedora-coreos-config

Author: openshift-merge-bot[bot]

common.yaml

@@ -65,9 +65,9 @@ postprocess:
     set -xeuo pipefail
     source /etc/os-release
     # always expect the file to be there, and that it turns on composefs
-    grep -Pz '\[composefs\]\nenabled = true\n' /usr/lib/ostree/prepare-root.conf
+    grep -Pz '\[composefs\]\nenabled = yes\n' /usr/lib/ostree/prepare-root.conf
     if [[ $VERSION_ID = 9.* ]]; then
-      sed -i -e 's,enabled = true,enabled = maybe,' /usr/lib/ostree/prepare-root.conf
+      sed -i -e 's,enabled = yes,enabled = maybe,' /usr/lib/ostree/prepare-root.conf
     fi
 
   # Mark the OS as of the CoreOS variant.

fedora-coreos-config

@@ -51,3 +51,7 @@
 - pattern: ext.config.shared.multipath.resilient
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1937
 
+- pattern: ext.config.shared.kdump.crash
+  tracker: https://github.com/coreos/rhel-coreos-config/issues/70
+  osversion:
+    - rhel-9.6

kola-denylist.yaml

@@ -2,6 +2,17 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
+check() {
+    # If we are in a kdump environment return 255, so this module is only
+    # included if some other module depends on it
+    # See: https://github.com/coreos/fedora-coreos-tracker/issues/1832
+    #
+    # This module requires integration with the rest of the initramfs, so don't include it by default.
+    if [[ $IN_KDUMP == 1 ]]; then
+        return 255
+    fi
+}
+
 depends() {
     echo systemd
 }

overlay.d/05rhcos/usr/lib/dracut/modules.d/10ignition-godebug/module-setup.sh

@@ -8,12 +8,19 @@
 # even though things are. Kube will do the actual health handling
 # for the machine.
 
-depends() {
-    echo network systemd
+check() {
+    # If we are in a kdump environment return 255, so this module is only
+    # included if some other module depends on it
+    # See: https://github.com/coreos/fedora-coreos-tracker/issues/1832
+    #
+    # This module requires integration with the rest of the initramfs, so don't include it by default.
+    if [[ $IN_KDUMP == 1 ]]; then
+        return 255
+    fi
 }
 
-check() {
-    return 0
+depends() {
+    echo network systemd
 }
 
 install() {

overlay.d/05rhcos/usr/lib/dracut/modules.d/30rhcos-afterburn-checkin/module-setup.sh

@@ -1,7 +1,14 @@
 #!/bin/bash
 
 check() {
-    return 0
+    # If we are in a kdump environment return 255, so this module is only
+    # included if some other module depends on it
+    # See: https://github.com/coreos/fedora-coreos-tracker/issues/1832
+    #
+    # This module requires integration with the rest of the initramfs, so don't include it by default.
+    if [[ $IN_KDUMP == 1 ]]; then
+        return 255
+    fi
 }
 
 depends() {

overlay.d/05rhcos/usr/lib/dracut/modules.d/40rhcos-fips/module-setup.sh

@@ -1,5 +1,16 @@
 #!/bin/bash
 
+check() {
+    # If we are in a kdump environment return 255, so this module is only
+    # included if some other module depends on it
+    # See: https://github.com/coreos/fedora-coreos-tracker/issues/1832
+    #
+    # This module requires integration with the rest of the initramfs, so don't include it by default.
+    if [[ $IN_KDUMP == 1 ]]; then
+        return 255
+    fi
+}
+
 install_unit() {
     local unit="$1"; shift
     local target="${1:-ignition-complete.target}"; shift