From 6a495f4e502f90ee923bc87aa48b27b6be206b95 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:43:20 +0200
Subject: [dnbd3-rootfs] improve kqcow loop module handling

---
 builder/modules.d/dnbd3-rootfs/module-setup.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh
index 9a7e892b..1dd16cd4 100755
--- a/builder/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh
@@ -168,10 +168,15 @@ installkernel() {
     inst "${moddir}/binaries/dnbd3/build/dnbd3.ko" "${block_kmod_dir}/dnbd3.ko"
 
     # kqcow2 kernel
-    mkdir -p "${initdir}/${block_kmod_dir}/loop"
-    for kmod in "${moddir}/binaries/kernel-qcow2-linux/drivers/block/loop/"*.ko ; do
-        inst "$kmod" "${block_kmod_dir}/loop/$(basename $kmod)"
-    done
+    local kqcow_loop_kmod_dir="${moddir}/binaries/kernel-qcow2-linux/drivers/block/loop"
+    if [ -e "${kqcow_loop_kmod_dir}/loop.ko" ] && \
+        [ -e "${kqcow_loop_kmod_dir}/loop_file_fmt_raw.ko" ] && \
+        [ -e "${kqcow_loop_kmod_dir}/loop_file_fmt_qcow.ko" ]; then
+            mkdir -p "${initdir}/${block_kmod_dir}/loop"
+            for kmod in "${kqcow_loop_kmod_dir}/"*.ko ; do
+                inst "$kmod" "${block_kmod_dir}/loop/$(basename $kmod)"
+            done
+    fi
 }
 install() {
     local __doc__='
-- 
cgit v1.2.3-55-g7522