From 526d4c0967eb8283e898636d8a604d47380b95a9 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 17 Sep 2019 18:31:54 +0200
Subject: build-initramfs.sh: improve submodule loop

---
 builder/build-initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 51ae5ddf..432df5fa 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -39,7 +39,7 @@ if [ ! -e "$_repo_dir" ]; then
     git submodule init
     # try to clone submodules as shallowy as possible, since we cannot just
     # use '--depth 1' on submodules residing on non-master branches...
-    for mod in $(awk '$1 == "[submodule" {gsub(/"|]/,"",$2); print $2}' .gitmodules); do
+    for mod in $(grep -Po '(?<=^\[submodule ")([^"]+)' .gitmodules); do
         url="$(git config -f .gitmodules --get submodule.${mod}.url)"
         path="$(git config -f .gitmodules --get submodule.${mod}.path)"
         branch="$(git config -f .gitmodules --get submodule.${mod}.branch)"
-- 
cgit v1.2.3-55-g7522


From d335968b2e815f869d8062c8c6ec6cad4e201479 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 12:39:54 +0200
Subject: [dnbd3-rootfs] exit if initializing fails

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

(limited to 'builder')

diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh
index 0356aa14..9a7e892b 100755
--- a/builder/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh
@@ -94,7 +94,10 @@ check() {
     `check`
     '
     exceptions.activate
-    build_initialize_components
+    if ! build_initialize_components; then
+        logging.error "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" ]] ||
-- 
cgit v1.2.3-55-g7522


From 37c87a7d08fd58ff3f445d81bfa9301ba952635c Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 12:52:07 +0200
Subject: [dnbd3-rootfs] formatting

---
 builder/modules.d/dnbd3-rootfs/helper/build.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'builder')

diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc
index 01dc4894..2c8eb58b 100644
--- a/builder/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc
@@ -20,8 +20,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
-- 
cgit v1.2.3-55-g7522


From 3b6b110632d3a903fa19a11c4cbdac9e2b105e4b Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 12:52:22 +0200
Subject: [dnbd3-rootfs] fix bad pushd/popd stack

---
 builder/modules.d/dnbd3-rootfs/helper/build.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc
index 2c8eb58b..1cf300a9 100644
--- a/builder/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc
@@ -182,7 +182,7 @@ 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} ../
-- 
cgit v1.2.3-55-g7522


From 4712f41110620b45e6f5de871263c75191c5c378 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 12:53:26 +0200
Subject: [dnbd3-rootfs] cleanup dnbd3 build

no need to build fuse nor dnbd3-server
---
 builder/modules.d/dnbd3-rootfs/helper/build.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc
index 1cf300a9..3a0cd5a3 100644
--- a/builder/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc
@@ -185,7 +185,12 @@ build_compile_dnbd3() {
     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
-- 
cgit v1.2.3-55-g7522


From ca42a6ed2509fe76eb26ead8e0fafebe3fd48951 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 13:22:47 +0200
Subject: build-initramfs.sh: remove dep warning for fuse

---
 builder/build-initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 432df5fa..9002105f 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -115,7 +115,7 @@ declare -A optional_shared_library_pattern_dependencies=()
 declare -A core_package_dependencies=()
 # shellcheck disable=SC2034
 declare -A optional_package_dependencies=(
-    ['fuse glib-2.0 pixman-1']='support template systems in container (usually used by virtual runtime environments)')
+    ['glib-2.0 pixman-1']='support template systems in container (usually used by virtual runtime environments)')
 # endregion
 # region functions
 ## region command line interface
-- 
cgit v1.2.3-55-g7522


From 85b9220e2a88c5cb7cdf061f6670483105b939d6 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 13:56:34 +0200
Subject: build-initramfs.sh: minor code ordering

---
 builder/build-initramfs.sh | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 9002105f..92d329b3 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -531,24 +531,6 @@ main() {
     `main`
     '
     exceptions.activate
-    # region sanity check kernel version and qcow handler
-    # if no kernel was specified as dracut argument, use the running kernel's version
-    logging.info "Building for:"
-    if [ -z "$kernel_version" ]; then
-       kernel_version="$(uname -r)"
-    fi
-    logging.info " * kernel version: $kernel_version"
-    # similar for kernel headers needed to compile dnbd3 against.
-    if [ -z "$kernel_headers" ]; then
-       kernel_headers="/lib/modules/${kernel_version}/build"
-    fi
-    if [ ! -f "${kernel_headers}/Makefile" ]; then
-       logging.critical 'Missing core dependency "linux-headers" for version to compile against given or current kernel.'
-    fi
-    logging.info " * kernel headers: $kernel_headers"
-    [ -n "$qcow_handler" ] && logging.info " * qcow2 handler: $qcow_handler"
-    export _QCOW_HANDLER="$qcow_handler"
-    # endregion
     # region dependency checks and command line parsing
     result=0
     dependency_check core dependencies utils_dependency_check program || \
@@ -575,6 +557,25 @@ main() {
         utils_dependency_check_pkgconfig package || result=$?
     [[ $result == 1 ]] && exit $result
     # endregion
+
+    # region sanity check kernel version and qcow handler
+    # if no kernel was specified as dracut argument, use the running kernel's version
+    logging.info "Building for:"
+    if [ -z "$kernel_version" ]; then
+       kernel_version="$(uname -r)"
+    fi
+    logging.info " * kernel version: $kernel_version"
+    # similar for kernel headers needed to compile dnbd3 against.
+    if [ -z "$kernel_headers" ]; then
+       kernel_headers="/lib/modules/${kernel_version}/build"
+    fi
+    if [ ! -f "${kernel_headers}/Makefile" ]; then
+       logging.critical 'Missing core dependency "linux-headers" for version to compile against given or current kernel.'
+    fi
+    logging.info " * kernel headers: $kernel_headers"
+    [ -n "$qcow_handler" ] && logging.info " * qcow2 handler: $qcow_handler"
+    # endregion
+
     # region handle delegated operations to specified target
     if [[ "$target" != '' ]]; then
         _target="$target"
-- 
cgit v1.2.3-55-g7522


From c75dbb5b3d816dd7cd0aa47179420897cd622861 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:05:57 +0200
Subject: Revert "build-initramfs.sh: remove dep warning for fuse"

This reverts commit ca42a6ed2509fe76eb26ead8e0fafebe3fd48951.
---
 builder/build-initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 92d329b3..dedc4f9e 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -115,7 +115,7 @@ declare -A optional_shared_library_pattern_dependencies=()
 declare -A core_package_dependencies=()
 # shellcheck disable=SC2034
 declare -A optional_package_dependencies=(
-    ['glib-2.0 pixman-1']='support template systems in container (usually used by virtual runtime environments)')
+    ['fuse glib-2.0 pixman-1']='support template systems in container (usually used by virtual runtime environments)')
 # endregion
 # region functions
 ## region command line interface
-- 
cgit v1.2.3-55-g7522


From 704ac40db0c9d15ea6747229cf5fa412921526db Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:16:47 +0200
Subject: builds-initramfs.sh: improve modules.d handling

and always call build_initialize_components
---
 builder/build-initramfs.sh | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index dedc4f9e..fe5786ec 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -63,12 +63,11 @@ if [ ! -e "$_repo_dir" ]; then
         done 2>/dev/null
     '
     popd
-    ln -s "${_repo_dir}/builder/modules.d" "${_root_dir}/modules.d"
 fi
 set +o errexit
 ## endregion
 # shellcheck source=./dnbd3-rootfs/scripts/rebash/core.sh
-source "${_root_dir}/modules.d/dnbd3-rootfs/scripts/rebash/core.sh"
+source "${_repo_dir}/builder/modules.d/dnbd3-rootfs/scripts/rebash/core.sh"
 core.import exceptions
 core.import logging
 core.import utils
@@ -649,24 +648,21 @@ main() {
         initialize_dracut
     fi
 
-    for _dracut_module in "${_root_dir}/modules.d/"*; do
-        [ -d "${_dracut_module}" ] || continue
-        _dracut_module="$(basename $_dracut_module)"
-        # shouldn't we use absolute paths here?
-        _dracut_module_relative_path="../../modules.d/${_dracut_module}"
+    for _dracut_module_dir in "${_repo_dir}/builder/modules.d/"*; do
+        [ -d "${_dracut_module_dir}" ] || continue
+        _dracut_module="$(basename $_dracut_module_dir)"
         # TODO change to *not* always use '90' ...
         _dracut_module_target="${_root_dir}/dracut/modules.d/00${_dracut_module}"
         if [[ ! -L "$_dracut_module_target" || "$(readlink \
-            "$_dracut_module_target")" != "$_dracut_module_relative_path" ]]; then
+            "$_dracut_module_target")" != "$_dracut_module_dir" ]]; then
             logging.info \
-                "Link ${_dracut_module} plugin into dracut modules folder ($_dracut_module_relative_path -> $_dracut_module_target)."
-            if ! ln --symbolic --force "$_dracut_module_relative_path" \
-            "$_dracut_module_target"; then
+                "Link ${_dracut_module} plugin into dracut modules folder ($_dracut_module_dir -> $_dracut_module_target)."
+            if ! ln --symbolic --force "$_dracut_module_dir" "$_dracut_module_target"; then
                 logging.warn \
-                    "Linking \"$_dracut_module_relative_path\" to \"$_dracut_module_target\" failed." \
+                    "Linking \"$_dracut_module_dir\" to \"$_dracut_module_target\" failed." \
                     " We will copy them. So we have to recopy it every time to ensure that recompiled things take effect."
                 cp --recursive --force --no-target-directory \
-                    "${_root_dir}/modules.d/$_dracut_module" \
+                    "$_dracut_module_dir" \
                     "$_dracut_module_target"
             fi
         fi
@@ -678,14 +674,14 @@ main() {
     if [ "$verbose" == 'yes' ]; then
         _loglevel='--verbose'
     fi
-    _modules='dnbd3-rootfs conf-tgz'
+    _modules=(dnbd3-rootfs conf-tgz)
     logging.info "Default modules: ${_modules}"
     if [ "$debug" == 'yes' ]; then
         _loglevel="$_loglevel --stdlog 4"
-        _modules="$_modules i18n terminfo"
+	_modules+=(i18n terminfo)
     fi
     if [ "$use_systemd_in_initramfs" == 'yes' ]; then
-        _modules="$_modules systemd systemd-initrd dracut-systemd"
+	_modules+=(systemd systemd-initrd dracut-systemd)
     fi
     # Preprocess done - start build, cleanup or full cleanup
     if [[ "$full_cleanup" == 'yes' ]]; then
@@ -695,10 +691,13 @@ main() {
     elif [[ "$cleanup" == 'yes' ]]; then
         logging.info 'Removing distribution specific files.'
         cleanup
-    elif [[ "$initialize" == 'yes' ]]; then
-        . "${_root_dir}/modules.d/dnbd3-rootfs/helper/build.inc"
-        build_initialize_components
     else
+        . "${_repo_dir}/builder/modules.d/dnbd3-rootfs/helper/build.inc"
+        build_initialize_components
+	if [[ "$initialize" == 'yes' ]]; then
+		logging.info "Initialized."
+		exit 0
+	fi
         logging.info 'Build initramfs.'
         # NOTE: We deactivate our exception handle since dracut returns "1" if
         # it is launched with help parameter ("-h" or "--help").
@@ -711,7 +710,7 @@ main() {
         logging.set_commands_level debug
         # shellcheck disable=SC2086
         "${_root_dir}/dracut/dracut.sh" --local \
-            $_loglevel --modules "$_modules" --conf /etc/dracut.conf \
+            $_loglevel --modules "${_modules[*]}" --conf /etc/dracut.conf \
             --confdir /etc/dracut.conf.d "${dracut_parameter[@]}" \
             --kver "${kernel_version}" "$file_path"
         _return_code=$?
-- 
cgit v1.2.3-55-g7522


From 5a3f1d4723727c16f0535d35066e01f93dbfd3ca Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:34:51 +0200
Subject: build-initramfs.sh: remove 'in-target' stuff

---
 builder/build-initramfs.sh | 59 ----------------------------------------------
 1 file changed, 59 deletions(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index fe5786ec..8825eacb 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -575,65 +575,6 @@ main() {
     [ -n "$qcow_handler" ] && logging.info " * qcow2 handler: $qcow_handler"
     # endregion
 
-    # region handle delegated operations to specified target
-    if [[ "$target" != '' ]]; then
-        _target="$target"
-        if [[ -f "$target" ]]; then
-            _target="$(mktemp --directory)"
-            _xmount_mountpoint_target="$(mktemp --directory)"
-            xmount --in qemu "$target" --out raw "$_xmount_mountpoint_target"
-            _xmount_device_target="$(losetup --find)"
-            losetup --partscan "$_xmount_device_target" \
-                "${_xmount_mountpoint_target}/"*.dd
-            # TODO Use partscan
-            mount "$_xmount_device_target" "$_target"
-        fi
-        if [[ -d "$_target" ]]; then
-            _temporary_working_directory="$(chroot "$_target" mktemp --directory)"
-            mount --bind "$(pwd)" "${_target}${_temporary_working_directory}"
-            _parameter_skip=false
-            _parameter_to_forward=()
-            for _parameter; do
-                if $_parameter_skip; then
-                    _parameter_skip=false
-                elif [[ "$_parameter" == '-t' ]] || \
-                     [[ "$_parameter" == '--target' ]]; then
-                    _parameter_skip=true
-                else
-                    _parameter_to_forward+=("$_parameter")
-                fi
-            done
-            # NOTE: We would have to temporary patch dracut to avoid removing the
-            # environment variables "LD_LIBRARY_PATH" and "LD_PRELOAD" to get
-            # "fakechroot" working with dracut. So we should remove this variables
-            # before running the patched dracut version to follow the initial
-            # intention. You should first do:
-            # >>> unset LD_LIBRARY_PATH
-            # >>> unset LD_PRELOAD
-            # and patch "dracut.sh" temporary to comment out:
-            # >>> unset LD_LIBRARY_PATH
-            # >>> unset LD_PRELOAD
-            # To avoid to broke the "fakechroot" environment pipe the ldconfig call
-            # to the native one:
-            # >>> FAKECHROOT_CMD_SUBST=/usr/bin/ldconfig=/usr/bin/ldconfig
-            # shellcheck disable=SC2086
-            change_root "${_target}" \
-                "${_temporary_working_directory}/${BASH_SOURCE[0]}" \
-                ${_parameter_to_forward[*]}
-            mv "${_target}/$file_path" "$file_path"
-            # Do cleanup procedures.
-            umount "${_target}${_temporary_working_directory}"
-            rm --recursive --force "${_target}${_temporary_working_directory}"
-            if [[ -f "$target" ]]; then
-                umount "$_target"
-                losetup --detach "$_xmount_device_target"
-                umount "$_xmount_mountpoint_target"
-                rm --recursive --force "$_target" "$_xmount_mountpoint_target"
-            fi
-        fi
-        exit 0
-    fi
-    # endregion
     # region handle '--update' to update all the modules in 'modules.d'
     if [ "$update" == "yes" ]; then
         pushd "${_repo_dir}"
-- 
cgit v1.2.3-55-g7522


From cac1d9bcd558d4a55001b76f6cafe55848684593 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:37:23 +0200
Subject: build-initramfs.sh: fix cleanup

---
 builder/build-initramfs.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 8825eacb..aaafe7fa 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -627,8 +627,7 @@ main() {
     # Preprocess done - start build, cleanup or full cleanup
     if [[ "$full_cleanup" == 'yes' ]]; then
         logging.info 'Removing all modules.'
-        rm "${_root_dir}/modules.d" \
-            "${_root_dir}/dracut" --recursive --force
+        rm "${_repo_dir}" "${_root_dir}/dracut" --recursive --force
     elif [[ "$cleanup" == 'yes' ]]; then
         logging.info 'Removing distribution specific files.'
         cleanup
-- 
cgit v1.2.3-55-g7522


From 2c48be5019ff60d44a2738f365bfbea1fdca88ea Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:41:28 +0200
Subject: build-initramfs.sh: fix comment

---
 builder/build-initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index aaafe7fa..1a6f86c4 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -592,7 +592,7 @@ main() {
     for _dracut_module_dir in "${_repo_dir}/builder/modules.d/"*; do
         [ -d "${_dracut_module_dir}" ] || continue
         _dracut_module="$(basename $_dracut_module_dir)"
-        # TODO change to *not* always use '90' ...
+        # TODO allow module-specific priority
         _dracut_module_target="${_root_dir}/dracut/modules.d/00${_dracut_module}"
         if [[ ! -L "$_dracut_module_target" || "$(readlink \
             "$_dracut_module_target")" != "$_dracut_module_dir" ]]; then
-- 
cgit v1.2.3-55-g7522


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(-)

(limited to 'builder')

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


From ec147311df5d73ff59ca04a95dd4a0e02abcca61 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 18 Sep 2019 14:56:22 +0200
Subject: build-initramfs.sh: fix log message

---
 builder/build-initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 1a6f86c4..a59ebab0 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -616,7 +616,7 @@ main() {
         _loglevel='--verbose'
     fi
     _modules=(dnbd3-rootfs conf-tgz)
-    logging.info "Default modules: ${_modules}"
+    logging.info "Default modules: ${_modules[@]}"
     if [ "$debug" == 'yes' ]; then
         _loglevel="$_loglevel --stdlog 4"
 	_modules+=(i18n terminfo)
-- 
cgit v1.2.3-55-g7522


From 6d494189f8b1059011bd53d468f832c98257f961 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 16 Oct 2019 14:42:03 +0200
Subject: [slx-dmsetup] fix encrypted scratch dev name

---
 builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'builder')

diff --git a/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device b/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
index c0f6a274..1756865e 100755
--- a/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
+++ b/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
@@ -273,7 +273,7 @@ save_partition_info "${scratch_device##*/}" "*" "1" "$scratch_device_size"
 # encrypt the scratch device, if configured
 if [ "$crypt" -ne 0 ] && encrypt_device \
 	"$scratch_device" "${scratch_device##*/}-crypt" "$scratch_device_size"; then
-	scratch_device="${scratch_device##*/}-crypt"
+	scratch_device="${scratch_device}-crypt"
 fi
 
 writable_device_allocated="$scratch_device_size"
@@ -319,7 +319,7 @@ create_pool() {
 	# create remaining thin volumes
 	modprobe dm-thin-pool || echo "$0: dm-thin-pool load failed, maybe builtin?"
 	# create temporary metadata device
-	data_block_size=256
+	data_block_size=255
 	# calculate number of sectors needed and check boundaries:
 	metadata_dev_size="$(( 48 * $writable_device_size / $data_block_size / 512 ))"
 	# Min 2MB -> 4096 sectors, max 16GB -> 33554432 sectors
-- 
cgit v1.2.3-55-g7522


From 575838e14470df890d017d49c980e2920d9a0fd9 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 16 Oct 2019 15:13:55 +0200
Subject: [slx-dmsetup] install xts kmod for dm-crypt

---
 builder/modules.d/slx-dmsetup/module-setup.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'builder')

diff --git a/builder/modules.d/slx-dmsetup/module-setup.sh b/builder/modules.d/slx-dmsetup/module-setup.sh
index 58c6e5cf..68e9b7b4 100755
--- a/builder/modules.d/slx-dmsetup/module-setup.sh
+++ b/builder/modules.d/slx-dmsetup/module-setup.sh
@@ -17,5 +17,8 @@ install() {
 }
 installkernel() {
 	# install those modules in case the used kernel does not have them builtin
-	instmods dm-thin-pool dm-snapshot dm-crypt crc32c xfs ext4
+	instmods \
+		dm-thin-pool dm-snapshot \
+		dm-crypt crc32c xts \
+		xfs ext4
 }
-- 
cgit v1.2.3-55-g7522


From 909028480646abce1552d902495dbcec0808dc38 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 25 Oct 2019 13:12:54 +0200
Subject: [slx-network] wait 30sec for network

to cope with some old/bad NICs that need >10sec to get up
---
 builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'builder')

diff --git a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 b/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3
index 4535ccd3..53ad8de9 100755
--- a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3
+++ b/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3
@@ -31,9 +31,9 @@ wait_for_iface() {
 set -x
 
 ip link set dev "$SLX_PXE_NETIF" up
-if ! wait_for_iface "$SLX_PXE_NETIF" 100; then
-	warn "'$SLX_PXE_NETIF' still not up after 10sec ... trying anyway."
-	# TODO handle case where we waited for 10sec and it is still not up
+if ! wait_for_iface "$SLX_PXE_NETIF" 300; then
+	warn "'$SLX_PXE_NETIF' still not up after 30sec ... trying anyway."
+	# TODO handle case where we waited for 30sec and it is still not up
 fi
 
 # now determine whether we are in bridged/vlan/plain mode
-- 
cgit v1.2.3-55-g7522