diff options
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs/module-setup.sh')
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/module-setup.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh index 78860f48..0356aa14 100755 --- a/builder/modules.d/dnbd3-rootfs/module-setup.sh +++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh @@ -94,11 +94,11 @@ check() { `check` ' exceptions.activate - initialize_components "$qcow_handler" + build_initialize_components # NOTE: xmount must be compiled before qemu_xmount local xmount_is_built=true if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] || - [[ -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then + [[ ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then xmount_is_built=false fi $xmount_is_built || logging.warn \ @@ -167,7 +167,7 @@ installkernel() { # 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 $file)" + inst "$kmod" "${block_kmod_dir}/loop/$(basename $kmod)" done } install() { @@ -199,10 +199,11 @@ install() { inst_libdir_file 'libewf.so*' fi # kqcow2 losetup - 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 - inst_libdir_file "${losetup_qcow2_dir}/*.so*" + local losetup_qcow2_dir="$moddir/binaries/kernel-qcow2-util-linux" + if [[ -f "${losetup_qcow2_dir}/.libs/losetup" ]]; then + inst "${losetup_qcow2_dir}/.libs/losetup" /usr/local/bin/losetup + mkdir -p "${initdir}/usr/local/lib" + cp -a "${losetup_qcow2_dir}/.libs/"*.so* "${initdir}/usr/local/lib" fi # endregion # region hooks @@ -270,7 +271,7 @@ install() { find \ grep \ insmod \ - losetup lsblk \ + lsblk \ mkfifo mktemp mount mountpoint \ sed sleep sort \ tee touch tr |