summaryrefslogtreecommitdiffstats
path: root/builder/modules.d/dnbd3-rootfs/helper
diff options
context:
space:
mode:
authorJonathan Bauer2020-01-27 11:14:32 +0100
committerJonathan Bauer2020-01-27 11:14:32 +0100
commitc8d2d0c60d8f65e1cc7ab9bead2e6d250a03a2e8 (patch)
tree7c6498cebae92c9982d4e9b1993abed183782af8 /builder/modules.d/dnbd3-rootfs/helper
parentbuilder/build-initramfs.sh: use this branch... (diff)
downloadsystemd-init-c8d2d0c60d8f65e1cc7ab9bead2e6d250a03a2e8.tar.gz
systemd-init-c8d2d0c60d8f65e1cc7ab9bead2e6d250a03a2e8.tar.xz
systemd-init-c8d2d0c60d8f65e1cc7ab9bead2e6d250a03a2e8.zip
fallback to building xmount only
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs/helper')
-rw-r--r--builder/modules.d/dnbd3-rootfs/helper/build.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc
index 3a0cd5a3..df866d72 100644
--- a/builder/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc
@@ -5,8 +5,9 @@
declare -rg _mainmoddir="$(dirname "${BASH_SOURCE[0]}")/.." 2> /dev/null
declare -rg _supported_qcow_handlers=("xmount" "kernel")
+# NOTE: expects 'qcow_handler' to be set in the environment, else
+# will only build support for xmount
build_initialize_components() {
- local qcow_handler="$_QCOW_HANDLER"
IFS='|' _pattern="^(${_supported_qcow_handlers[*]})$" export _pattern
if [[ ! "$qcow_handler" =~ $_pattern ]] ; then
logging.warn "Unknown qcow handler '$qcow_handler' - will built all known."
@@ -41,7 +42,7 @@ build_initialize_components() {
fi
fi
fi
- if [ -z "$qcow_handler" ] || [ "$qcow_handler" = "kernel" ]; then
+ if [ "$qcow_handler" = "kernel" ]; then
if [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop.ko" ] \
|| [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop_file_fmt_qcow.ko" ] \
|| [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop_file_fmt_raw.ko" ]; then