From 60c10abb074ab5810d1affd98d8e5087f4d78893 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 24 May 2023 23:20:00 -0400 Subject: [PATCH] manifests/fedora-coreos-base: drop dracut nvmf workaround Mostly a revert of e49baba. This was fixed in dracut some time ago [1] and this is now dead code since we are on F38. [1] https://github.com/dracutdevs/dracut/pull/1777 --- manifests/fedora-coreos-base.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index 33038d9286..495439f49c 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -63,20 +63,6 @@ postprocess: #!/usr/bin/env bash systemctl mask dnsmasq.service - # Fedora 37 adds the nvmf dracut module to the initrd, causing - # ext.config.files.dracut-executable to notice that the module puts a - # non-executable file in /usr/sbin. Dracut has been updated to fix the - # missing permission, and hopefully this can be removed for Fedora 38. - # https://github.com/coreos/fedora-coreos-tracker/issues/1155 - # https://github.com/dracutdevs/dracut/pull/1777 - - | - #!/usr/bin/env bash - set -xeuo pipefail - source /etc/os-release - if [ ${VERSION_ID} -le 37 ]; then - chmod +x /usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh - fi - # Default to iptables-nft. Otherwise, legacy wins. We can drop this once/if we # remove iptables-legacy. This is needed because alternatives don't work # https://github.com/coreos/fedora-coreos-tracker/issues/677