diff options
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs')
| -rw-r--r-- | builder/modules.d/dnbd3-rootfs/helper/build.inc | 13 | ||||
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/module-setup.sh | 18 |
2 files changed, 22 insertions, 9 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index bb992de1..2410c633 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -19,8 +19,8 @@ build_initialize_components() { logging.info "Could not find dnbd3, building it..." if ! CMAKE_FLAGS="-DKERNEL_DIR=${kernel_headers}" \ build_compile_dnbd3 "${_deps_base_dir}/dnbd3/"; then - logging.error "Failed to build dnbd3." - return 1 + logging.error "Failed to build dnbd3." + return 1 fi fi # take care of the qcow handler @@ -181,10 +181,15 @@ build_compile_dnbd3() { # NOTE: The generic way would be: "./build.sh" but this tries to build # more than we really need and takes more time. mkdir --parents build - pushd build + cd build # Inject CMAKE_FLAGS as a way to control how cmake is called, # e.g. to pass the kernel version - cmake ${CMAKE_FLAGS} ../ + cmake ${CMAKE_FLAGS} \ + -DBUILD_FUSE_CLIENT=OFF \ + -DBUILD_KERNEL_MODULE=ON \ + -DBUILD_SERVER=OFF \ + -DBUILD_STRESSTEST=OFF \ + ../ make -j dnbd3 dnbd3-client local ret=$? popd diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh index 63bb0b29..c2fea3b2 100755 --- a/builder/modules.d/dnbd3-rootfs/module-setup.sh +++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh @@ -68,7 +68,10 @@ clean() { } # region dracut plugin api check() { - build_initialize_components + if ! build_initialize_components; then + echo "Failed to initialize components." + return 1 + fi # NOTE: xmount must be compiled before qemu_xmount local xmount_is_built=true if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] || @@ -118,10 +121,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() { # region binaries |