diff options
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs/module-setup.sh')
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/module-setup.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh index ed5a59cf..78860f48 100755 --- a/builder/modules.d/dnbd3-rootfs/module-setup.sh +++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh @@ -94,7 +94,7 @@ check() { `check` ' exceptions.activate - initialize_components + initialize_components "$qcow_handler" # NOTE: xmount must be compiled before qemu_xmount local xmount_is_built=true if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] || @@ -161,11 +161,11 @@ installkernel() { local block_kmod_dir="/lib/modules/${kernel}/kernel/drivers/block" # dnbd3 - mkdir "${initdir}/${block_kmod_dir}" + mkdir -p "${initdir}/${block_kmod_dir}" inst "${moddir}/binaries/dnbd3/build/dnbd3.ko" "${block_kmod_dir}/dnbd3.ko" # kqcow2 kernel - mkdir "${initdir}/${block_kmod_dir}/loop" + 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 $file)" done @@ -202,10 +202,7 @@ install() { local kernel_qcow2_util_linux_repo="$moddir/binaries/kernel-qcow2-util-linux" if [[ -f "${kernel_qcow2_repo}/.libs/losetup" ]]; then inst "${kernel_qcow2_repo}/.libs/losetup" /usr/local/bin/losetup - for lib in "${kernel_qcow2_repo}/"*.so*; do - # TODO check inst_libdir_file - inst "$file" "/usr/lib/$(basename $file)" - done + inst_libdir_file "${losetup_qcow2_dir}/*.so*" fi # endregion # region hooks |