Skip to content

Commit 26e698c

Browse files
committed
sys-kernel/coreos-kernel: Add Fusion storage drivers back to initrd
The Fusion MPT SCSI storage drivers were missing from the new minimal initrd because they are not together with the other storage driver modules but live in their own "message/fusion/" folder. Add the "message/fusion/" folder to the initrd modules so that we can load the disk. Dependencies will be resolved by dracut-install as needed. Fixes flatcar/Flatcar#1924 Signed-off-by: Kai Lueke <kailuke@microsoft.com>
1 parent 44be28e commit 26e698c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Alpha only: Added Fusion SCSI disk drivers back to the initrd after they got lost in the rework ([Flatcar#1924](https://github.com/flatcar/Flatcar/issues/1924))

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.12.54.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ src_compile() {
116116
cp "${S}"/build/bootengine/lib/modprobe.d/* lib/modprobe.d/ || die
117117
# Only include modules related to mounting /usr and for interacting with the emergency console
118118
pushd "${S}/build/bootengine/usr/lib/modules/${KV_FULL}" || die
119-
find kernel/drivers/{ata,block,hid,hv,input/serio,mmc,nvme,pci,scsi,usb} kernel/fs/{btrfs,overlayfs,squashfs} kernel/security/keys -name "*.ko.*" -printf "%f\0" | DRACUT_NO_XATTR=1 xargs --null "${BROOT}"/usr/lib/dracut/dracut-install --destrootdir "${S}"/build/minimal --kerneldir . --sysrootdir "${S}"/build/bootengine/ --firmwaredirs "${S}"/build/bootengine/usr/lib/firmware --module dm-verity dm-mod virtio_console || die
119+
find kernel/drivers/{ata,block,hid,hv,input/serio,message/fusion,mmc,nvme,pci,scsi,usb} kernel/fs/{btrfs,overlayfs,squashfs} kernel/security/keys -name "*.ko.*" -printf "%f\0" | DRACUT_NO_XATTR=1 xargs --null "${BROOT}"/usr/lib/dracut/dracut-install --destrootdir "${S}"/build/minimal --kerneldir . --sysrootdir "${S}"/build/bootengine/ --firmwaredirs "${S}"/build/bootengine/usr/lib/firmware --module dm-verity dm-mod virtio_console || die
120120
popd || die
121121
# Double compression only makes the image bigger and slower
122122
find . -name "*.ko.xz" -exec unxz {} + || die

0 commit comments

Comments
 (0)