diff options
| author | Jonathan Bauer | 2020-03-24 17:40:02 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2020-03-24 17:40:02 +0100 |
| commit | a01ecfdce908fe7f658cf18c2df20bd3cd688fc4 (patch) | |
| tree | 9ead7ffb73b8412da6f94f350e45973657dc53a8 /builder | |
| parent | Should not download dracut, dowloader scripts is doing it now (diff) | |
| parent | Update dnbd3-ng version (diff) | |
| download | systemd-init-a01ecfdce908fe7f658cf18c2df20bd3cd688fc4.tar.gz systemd-init-a01ecfdce908fe7f658cf18c2df20bd3cd688fc4.tar.xz systemd-init-a01ecfdce908fe7f658cf18c2df20bd3cd688fc4.zip | |
Merge branch 'centos8' into downloader
Diffstat (limited to 'builder')
6 files changed, 7 insertions, 4 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 b/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 -Subproject c881c79f31efb0ec401549494fc13a91136cf43 +Subproject a6ddfe1212a2df72cacb0f44cc872b1bd0363c3 diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux -Subproject f9b4646c47caf5c123a32d24cf3d84bb2928771 +Subproject 0761b3e9e03ed63b4adfd8b4a82f334352729a4 diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index 13ab9159..b3f9561c 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -247,6 +247,7 @@ build_compile_losetup_qcow() { ./autogen.sh ./configure make -j losetup + gcc -I./libsmartcols/src -O2 -o .libs/losetup sys-utils/losetup-losetup.o .libs/libcommon.a .libs/libsmartcols.a ) local ret=$? popd diff --git a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh index 7eb77e87..b3d3eb75 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh @@ -2,10 +2,10 @@ # -*- coding: utf-8 -*- type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh for kmod in dnbd3 \ - loop \ + "loop max_loop=8" \ loop_file_fmt_qcow \ loop_file_fmt_raw; do - if ! modprobe "${kmod}"; then + if ! modprobe ${kmod}; then warn "Failed to load kernel module: $kmod" ! : fi diff --git a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh index 702b6331..6f31bbac 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh @@ -1,5 +1,3 @@ -#!/usr/bin/env bash -# -*- coding: utf-8 -*- type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh source "/etc/openslx" diff --git a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh index 6a6b64f2..aa782184 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -2,6 +2,10 @@ type emergency_shell > /dev/null 2>&1 || source /lib/dracut-lib.sh source /etc/openslx +export PATH="/usr/local/bin:$PATH" +export LD_LIBRARY_PATH="/usr/local/lib" + + # hardcode dnbd device path declare -rg _dnbd3_dev="/dev/dnbd0" |