From: Michal Koutný Date: Mon, 19 Jun 2023 14:40:49 +0000 (+0200) Subject: fix(btrfs): do not require module via cmdline when --no-kernel X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ed765dd23e4c5616c82d1cbf8b4dbceaafc7647;p=thirdparty%2Fdracut.git fix(btrfs): do not require module via cmdline when --no-kernel initrd built without modules would fail when it attempts to load a kernel module. (Use case scenario: kernel with built-in module.) synthesize an the cmdline only when modules are truly installed. --- diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh index 3a047053e..5d8813320 100755 --- a/modules.d/90btrfs/module-setup.sh +++ b/modules.d/90btrfs/module-setup.sh @@ -32,6 +32,7 @@ cmdline() { # called by dracut installkernel() { instmods btrfs + printf "%s\n" "$(cmdline)" > "${initdir}/etc/cmdline.d/00-btrfs.conf" } # called by dracut @@ -56,6 +57,4 @@ install() { inst_multiple -o btrfsck btrfs-zero-log inst "$(command -v btrfs)" /sbin/btrfs - - printf "%s\n" "$(cmdline)" > "${initdir}/etc/cmdline.d/00-btrfs.conf" }