Skip to content

Commit

Permalink
manifests/fedora-coreos-base: drop dracut nvmf workaround
Browse files Browse the repository at this point in the history
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] dracutdevs/dracut#1777
  • Loading branch information
dustymabe authored and HuijingHei committed Oct 10, 2023
1 parent 4ba09eb commit 60c10ab
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60c10ab

Please sign in to comment.