commit: 503aeddb91ea1c5d3afd81287c49c0db238f6743
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 00:29:08 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=503aeddb
linuxrc: Make sure that we always load bcache module when dobcache is set
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
defaults/linuxrc | 7 +++++++
defaults/modules_load | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index f01203b..63df802 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -503,6 +503,13 @@ then
FIRSTMODS="${FIRSTMODS} crc32_generic"
fi
+if [ "${USE_BCACHE}" = '1' ]
+then
+ # Force loading of bcache module in case module loading would
+ # be skipped because $REAL_ROOT is already present
+ FIRSTMODS="${FIRSTMODS} bcache"
+fi
+
splash 'init'
cmdline_hwopts
diff --git a/defaults/modules_load b/defaults/modules_load
index f55fab3..b4caf50 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -27,7 +27,7 @@ MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092
i82365 tcic ds ide
MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
# Crypto
MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic
aes_generic xts"
