Include crc32c module for xfs.

Just like btrfs, xfs now requires CRC module that cannot be resolved via
normal module resolving.

Move this hack into fs-lib and remove it from btrfs module.

https://bugs.mageia.org/show_bug.cgi?id=8676

diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
index d2e559fd873e3106a6f57aabbb359bdd74ccc65b..526d9dd43189d579a755e54594633046095e12de 100755 (executable)
--- a/modules.d/90btrfs/module-setup.sh
+++ b/modules.d/90btrfs/module-setup.sh
@@ -26,7 +26,7 @@ depends() {
 }
 
 installkernel() {
-    instmods btrfs crc32c
+    instmods btrfs
 }
 
 install() {

diff --git a/modules.d/99fs-lib/module-setup.sh b/modules.d/99fs-lib/module-setup.sh
index 344dcdf04a44122c2a65fed74588ec30c3f2df83..637737ee8adb1db5790f5745c818c56867f7fc75 100755 (executable)
--- a/modules.d/99fs-lib/module-setup.sh
+++ b/modules.d/99fs-lib/module-setup.sh
@@ -35,6 +35,24 @@ echo_fs_helper() {
     esac
 }
 
+include_fs_helper_modules() {
+    local dev=$1 fs=$2
+    case "$fs" in
+        xfs|btrfs)
+            instmods crc32c
+            ;;
+    esac
+}
+
+installkernel() {
+    # xfs and btrfs needs crc32c...
+    if [[ $hostonly ]]; then
+        for_each_host_dev_fs include_fs_helper_modules
+        :
+    else
+        instmods crc32c
+    fi
+}
 
 install() {
     local _helpers