Skip to content

Commit

Permalink
manifests: work around non-executable initrd script in rawhide
Browse files Browse the repository at this point in the history
The 95nvmf Dracut module has always shipped a non-executable script,
but we didn't notice until the rawhide nvme package caused that module
to start installing itself.  Fix the executable bit until the upstream
Dracut fix can propagate.

Fixes coreos/fedora-coreos-tracker#1155.
  • Loading branch information
bgilbert authored and dustymabe committed Apr 18, 2022
1 parent b3046bf commit e49baba
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
5 changes: 0 additions & 5 deletions kola-denylist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,3 @@
- testing-devel
- next
- next-devel
- pattern: ext.config.files.dracut-executable
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1155
snooze: 2022-04-18
streams:
- rawhide
14 changes: 14 additions & 0 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,20 @@ postprocess:
echo 'DEFAULT_HOSTNAME=localhost' >> /usr/lib/os-release
fi
# 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
# Packages listed here should be specific to Fedore CoreOS (as in not yet
# available in RHCOS or not desired in RHCOS). All other packages should go
# into one of the sub-manifests listed at the top.
Expand Down

0 comments on commit e49baba

Please sign in to comment.